From 4ad29cb701d60f6cee27f61e53892552fdf80c3a Mon Sep 17 00:00:00 2001 From: Ruben de Laat Date: Tue, 18 Sep 2018 10:05:59 +0200 Subject: [PATCH] Refactoring and added issued date to oauth token --- .../org/bimserver/interfaces/SConverter.java | 10562 ++++++++-------- BimServer/models/models.ecore | 1 + BimServer/models/models.genmodel | 1 + BimServer/src/org/bimserver/BimServer.java | 2 +- .../src/org/bimserver/database/Database.java | 2 +- .../database/migrations/steps/Step0043.java | 38 + .../database/queries/QueryPartStackFrame.java | 2 + .../database/queries/StartFrame.java | 3 + .../accellerator}/DensityThreshold.java | 2 +- .../accellerator}/DensityThresholdKey.java | 2 +- .../accellerator}/GeometryAccellerator.java | 73 +- .../accellerator}/GeometryObject.java | 2 +- .../accellerator}/Node.java | 5 +- .../accellerator}/Octree.java | 4 +- .../accellerator}/OctreeKey.java | 2 +- .../accellerator}/ReuseKey.java | 2 +- .../accellerator}/ReuseObject.java | 2 +- .../accellerator}/ReuseSet.java | 2 +- .../accellerator}/Traverser.java | 2 +- .../bimserver/servlets/BimBotsWebSocket.java | 5 + .../src/org/bimserver/servlets/Streamer.java | 1 - .../webservices/impl/OAuthServiceImpl.java | 7 +- .../webservices/impl/ServiceImpl.java | 8 +- .../protocolbuffers/ServiceInterface.desc | 7 +- .../protocolbuffers/ServiceInterface.proto | 1 - .../org.eclipse.wst.common.component | 2 +- .../objects/SOAuthAuthorizationCode.java | 17 + .../models/store/OAuthAuthorizationCode.java | 28 + .../bimserver/models/store/StorePackage.java | 30 +- .../impl/OAuthAuthorizationCodeImpl.java | 20 + .../models/store/impl/StorePackageImpl.java | 9 + .../bimserver/models/store/impl/store.ecore | 1 + .../org/bimserver/shared/meta/SPackage.java | 76 +- Tests/src/org/bimserver/test/RemoveEmpty.java | 32 + 34 files changed, 5560 insertions(+), 5393 deletions(-) create mode 100644 BimServer/src/org/bimserver/database/migrations/steps/Step0043.java rename BimServer/src/org/bimserver/{database/queries => geometry/accellerator}/DensityThreshold.java (79%) rename BimServer/src/org/bimserver/{database/queries => geometry/accellerator}/DensityThresholdKey.java (93%) rename BimServer/src/org/bimserver/{database/queries => geometry/accellerator}/GeometryAccellerator.java (82%) rename BimServer/src/org/bimserver/{database/queries => geometry/accellerator}/GeometryObject.java (91%) rename BimServer/src/org/bimserver/{database/queries => geometry/accellerator}/Node.java (91%) rename BimServer/src/org/bimserver/{database/queries => geometry/accellerator}/Octree.java (86%) rename BimServer/src/org/bimserver/{database/queries => geometry/accellerator}/OctreeKey.java (95%) rename BimServer/src/org/bimserver/{database/queries => geometry/accellerator}/ReuseKey.java (92%) rename BimServer/src/org/bimserver/{database/queries => geometry/accellerator}/ReuseObject.java (91%) rename BimServer/src/org/bimserver/{database/queries => geometry/accellerator}/ReuseSet.java (93%) rename BimServer/src/org/bimserver/{database/queries => geometry/accellerator}/Traverser.java (62%) create mode 100644 BimServer/src/org/bimserver/servlets/BimBotsWebSocket.java create mode 100644 Tests/src/org/bimserver/test/RemoveEmpty.java diff --git a/BimServer/generated/org/bimserver/interfaces/SConverter.java b/BimServer/generated/org/bimserver/interfaces/SConverter.java index 27340b4319..9270afa855 100644 --- a/BimServer/generated/org/bimserver/interfaces/SConverter.java +++ b/BimServer/generated/org/bimserver/interfaces/SConverter.java @@ -31,147 +31,109 @@ public class SConverter { private static final Logger LOGGER = LoggerFactory.getLogger(SConverter.class); - public SUserType convertToSObject(UserType input) { - return SUserType.values()[input.ordinal()]; - } - - public UserType convertFromSObject(SUserType input) { - return UserType.values()[input.ordinal()]; - } - public SSIPrefix convertToSObject(SIPrefix input) { - return SSIPrefix.values()[input.ordinal()]; - } - - public SIPrefix convertFromSObject(SSIPrefix input) { - return SIPrefix.values()[input.ordinal()]; - } - public SObjectState convertToSObject(ObjectState input) { - return SObjectState.values()[input.ordinal()]; + public SAccessMethod convertToSObject(AccessMethod input) { + return SAccessMethod.values()[input.ordinal()]; } - public ObjectState convertFromSObject(SObjectState input) { - return ObjectState.values()[input.ordinal()]; + public AccessMethod convertFromSObject(SAccessMethod input) { + return AccessMethod.values()[input.ordinal()]; } - public Set convertToSSetProject(Collection input) { - Set result = new HashSet(); - for (Project o : input) { + public Set convertToSSetLogAction(Collection input) { + Set result = new HashSet(); + for (LogAction o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetProject(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SProject o : input) { + public Set convertFromSSetLogAction(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SLogAction o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListProject(Collection input) { - List result = new ArrayList(); - for (Project o : input) { + public List convertToSListLogAction(Collection input) { + List result = new ArrayList(); + for (LogAction o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListProject(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SProject o : input) { + public List convertFromSListLogAction(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SLogAction o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SProject convertToSObject(Project input) { + public SLogAction convertToSObject(LogAction input) { if (input == null) { return null; } - SProject result = new SProject(); - result.setOid(input.getOid()); - result.setRid(input.getRid()); - result.setId(input.getId()); - result.setName(input.getName()); - result.setState(SObjectState.values()[input.getState().ordinal()]); - result.setCreatedDate(input.getCreatedDate()); - result.setDescription(input.getDescription()); - result.setExportLengthMeasurePrefix(SSIPrefix.values()[input.getExportLengthMeasurePrefix().ordinal()]); - result.setSchema(input.getSchema()); - result.setSendEmailOnNewRevision(input.isSendEmailOnNewRevision()); - result.setCheckinInProgress(input.getCheckinInProgress()); - result.setUuid(input.getUuid()); - List listhasAuthorizedUsers = new ArrayList(); - for (User v : input.getHasAuthorizedUsers()) { - listhasAuthorizedUsers.add(v.getOid()); + if (input instanceof ExtendedDataAddedToRevision) { + return convertToSObject((ExtendedDataAddedToRevision)input); } - result.setHasAuthorizedUsers(listhasAuthorizedUsers); - List listconcreteRevisions = new ArrayList(); - for (ConcreteRevision v : input.getConcreteRevisions()) { - listconcreteRevisions.add(v.getOid()); + else if (input instanceof NewObjectIDMUploaded) { + return convertToSObject((NewObjectIDMUploaded)input); } - result.setConcreteRevisions(listconcreteRevisions); - List listrevisions = new ArrayList(); - for (Revision v : input.getRevisions()) { - listrevisions.add(v.getOid()); + else if (input instanceof GeoTagUpdated) { + return convertToSObject((GeoTagUpdated)input); } - result.setRevisions(listrevisions); - ConcreteRevision lastConcreteRevisionVal = input.getLastConcreteRevision(); - result.setLastConcreteRevisionId(lastConcreteRevisionVal == null ? -1 : lastConcreteRevisionVal.getOid()); - Revision lastRevisionVal = input.getLastRevision(); - result.setLastRevisionId(lastRevisionVal == null ? -1 : lastRevisionVal.getOid()); - List listcheckouts = new ArrayList(); - for (Checkout v : input.getCheckouts()) { - listcheckouts.add(v.getOid()); + else if (input instanceof ProjectRelated) { + return convertToSObject((ProjectRelated)input); } - result.setCheckouts(listcheckouts); - User createdByVal = input.getCreatedBy(); - result.setCreatedById(createdByVal == null ? -1 : createdByVal.getOid()); - GeoTag geoTagVal = input.getGeoTag(); - result.setGeoTagId(geoTagVal == null ? -1 : geoTagVal.getOid()); - List listsubProjects = new ArrayList(); - for (Project v : input.getSubProjects()) { - listsubProjects.add(v.getOid()); + else if (input instanceof SettingsSaved) { + return convertToSObject((SettingsSaved)input); } - result.setSubProjects(listsubProjects); - Project parentVal = input.getParent(); - result.setParentId(parentVal == null ? -1 : parentVal.getOid()); - List listextendedData = new ArrayList(); - for (ExtendedData v : input.getExtendedData()) { - listextendedData.add(v.getOid()); + else if (input instanceof DatabaseCreated) { + return convertToSObject((DatabaseCreated)input); } - result.setExtendedData(listextendedData); - List listservices = new ArrayList(); - for (Service v : input.getServices()) { - listservices.add(v.getOid()); + else if (input instanceof CheckoutRelated) { + return convertToSObject((CheckoutRelated)input); } - result.setServices(listservices); - List listlogs = new ArrayList(); - for (ProjectRelated v : input.getLogs()) { - listlogs.add(v.getOid()); + else if (input instanceof UserRelated) { + return convertToSObject((UserRelated)input); } - result.setLogs(listlogs); - List listmodelCheckers = new ArrayList(); - for (ModelCheckerInstance v : input.getModelCheckers()) { - listmodelCheckers.add(v.getOid()); + else if (input instanceof RevisionRelated) { + return convertToSObject((RevisionRelated)input); } - result.setModelCheckers(listmodelCheckers); - List listnewServices = new ArrayList(); - for (NewService v : input.getNewServices()) { - listnewServices.add(v.getOid()); + else if (input instanceof Download) { + return convertToSObject((Download)input); } - result.setNewServices(listnewServices); + else if (input instanceof ExtendedDataAddedToProject) { + return convertToSObject((ExtendedDataAddedToProject)input); + } + else if (input instanceof RemoteServiceCalled) { + return convertToSObject((RemoteServiceCalled)input); + } + else if (input instanceof ServerStarted) { + return convertToSObject((ServerStarted)input); + } + else if (input instanceof RevisionBranched) { + return convertToSObject((RevisionBranched)input); + } + SLogAction result = new SLogAction(); + result.setOid(input.getOid()); + result.setRid(input.getRid()); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); return result; } - public Project convertFromSObject(SProject input, DatabaseSession session) throws BimserverDatabaseException { + public LogAction convertFromSObject(SLogAction input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - Project result = convertFromSObject(input, StoreFactory.eINSTANCE.createProject(), session); + LogAction result = convertFromSObject(input, LogFactory.eINSTANCE.createLogAction(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -179,173 +141,117 @@ public Project convertFromSObject(SProject input, DatabaseSession session) throw return result; } - public Project convertFromSObject(SProject input) throws BimserverDatabaseException { - Project result = convertFromSObject(input, StoreFactory.eINSTANCE.createProject(), null); + public LogAction convertFromSObject(SLogAction input) throws BimserverDatabaseException { + LogAction result = convertFromSObject(input, LogFactory.eINSTANCE.createLogAction(), null); return result; } - public Project convertFromSObject(SProject input, Project result, DatabaseSession session) throws BimserverDatabaseException { + public LogAction convertFromSObject(SLogAction input, LogAction result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setId(input.getId()); - result.setName(input.getName()); - result.setState(ObjectState.values()[input.getState().ordinal()]); - result.setCreatedDate(input.getCreatedDate()); - result.setDescription(input.getDescription()); - result.setExportLengthMeasurePrefix(SIPrefix.values()[input.getExportLengthMeasurePrefix().ordinal()]); - result.setSchema(input.getSchema()); - result.setSendEmailOnNewRevision(input.isSendEmailOnNewRevision()); - result.setCheckinInProgress(input.getCheckinInProgress()); - result.setUuid(input.getUuid()); - List listhasAuthorizedUsers = result.getHasAuthorizedUsers(); - for (long oid : input.getHasAuthorizedUsers()) { - listhasAuthorizedUsers.add((User)session.get(StorePackage.eINSTANCE.getUser(), oid, OldQuery.getDefault())); + if (input instanceof SExtendedDataAddedToRevision) { + return convertFromSObject((SExtendedDataAddedToRevision)input, session); } - List listconcreteRevisions = result.getConcreteRevisions(); - for (long oid : input.getConcreteRevisions()) { - listconcreteRevisions.add((ConcreteRevision)session.get(StorePackage.eINSTANCE.getConcreteRevision(), oid, OldQuery.getDefault())); + else if (input instanceof SNewObjectIDMUploaded) { + return convertFromSObject((SNewObjectIDMUploaded)input, session); } - List listrevisions = result.getRevisions(); - for (long oid : input.getRevisions()) { - listrevisions.add((Revision)session.get(StorePackage.eINSTANCE.getRevision(), oid, OldQuery.getDefault())); + else if (input instanceof SGeoTagUpdated) { + return convertFromSObject((SGeoTagUpdated)input, session); } - result.setLastConcreteRevision((ConcreteRevision)session.get(StorePackage.eINSTANCE.getConcreteRevision(), input.getLastConcreteRevisionId(), OldQuery.getDefault())); - result.setLastRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getLastRevisionId(), OldQuery.getDefault())); - List listcheckouts = result.getCheckouts(); - for (long oid : input.getCheckouts()) { - listcheckouts.add((Checkout)session.get(StorePackage.eINSTANCE.getCheckout(), oid, OldQuery.getDefault())); + else if (input instanceof SProjectRelated) { + return convertFromSObject((SProjectRelated)input, session); } - result.setCreatedBy((User)session.get(StorePackage.eINSTANCE.getUser(), input.getCreatedById(), OldQuery.getDefault())); - result.setGeoTag((GeoTag)session.get(StorePackage.eINSTANCE.getGeoTag(), input.getGeoTagId(), OldQuery.getDefault())); - List listsubProjects = result.getSubProjects(); - for (long oid : input.getSubProjects()) { - listsubProjects.add((Project)session.get(StorePackage.eINSTANCE.getProject(), oid, OldQuery.getDefault())); + else if (input instanceof SSettingsSaved) { + return convertFromSObject((SSettingsSaved)input, session); } - result.setParent((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getParentId(), OldQuery.getDefault())); - List listextendedData = result.getExtendedData(); - for (long oid : input.getExtendedData()) { - listextendedData.add((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), oid, OldQuery.getDefault())); + else if (input instanceof SDatabaseCreated) { + return convertFromSObject((SDatabaseCreated)input, session); } - List listservices = result.getServices(); - for (long oid : input.getServices()) { - listservices.add((Service)session.get(StorePackage.eINSTANCE.getService(), oid, OldQuery.getDefault())); + else if (input instanceof SCheckoutRelated) { + return convertFromSObject((SCheckoutRelated)input, session); } - List listlogs = result.getLogs(); - for (long oid : input.getLogs()) { - listlogs.add((ProjectRelated)session.get(LogPackage.eINSTANCE.getProjectRelated(), oid, OldQuery.getDefault())); + else if (input instanceof SUserRelated) { + return convertFromSObject((SUserRelated)input, session); } - List listmodelCheckers = result.getModelCheckers(); - for (long oid : input.getModelCheckers()) { - listmodelCheckers.add((ModelCheckerInstance)session.get(StorePackage.eINSTANCE.getModelCheckerInstance(), oid, OldQuery.getDefault())); + else if (input instanceof SRevisionRelated) { + return convertFromSObject((SRevisionRelated)input, session); } - List listnewServices = result.getNewServices(); - for (long oid : input.getNewServices()) { - listnewServices.add((NewService)session.get(StorePackage.eINSTANCE.getNewService(), oid, OldQuery.getDefault())); + else if (input instanceof SDownload) { + return convertFromSObject((SDownload)input, session); + } + else if (input instanceof SExtendedDataAddedToProject) { + return convertFromSObject((SExtendedDataAddedToProject)input, session); + } + else if (input instanceof SRemoteServiceCalled) { + return convertFromSObject((SRemoteServiceCalled)input, session); + } + else if (input instanceof SServerStarted) { + return convertFromSObject((SServerStarted)input, session); + } + else if (input instanceof SRevisionBranched) { + return convertFromSObject((SRevisionBranched)input, session); } + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); return result; } - public Set convertToSSetUser(Collection input) { - Set result = new HashSet(); - for (User o : input) { + public Set convertToSSetServerLog(Collection input) { + Set result = new HashSet(); + for (ServerLog o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetUser(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SUser o : input) { + public Set convertFromSSetServerLog(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SServerLog o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListUser(Collection input) { - List result = new ArrayList(); - for (User o : input) { - result.add(convertToSObject(o)); + public List convertToSListServerLog(Collection input) { + List result = new ArrayList(); + for (ServerLog o : input) { + result.add(convertToSObject(o)); } return result; } - public List convertFromSListUser(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SUser o : input) { + public List convertFromSListServerLog(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SServerLog o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SUser convertToSObject(User input) { + public SServerLog convertToSObject(ServerLog input) { if (input == null) { return null; } - SUser result = new SUser(); + SServerLog result = new SServerLog(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setName(input.getName()); - result.setPasswordHash(input.getPasswordHash()); - result.setPasswordSalt(input.getPasswordSalt()); - result.setState(SObjectState.values()[input.getState().ordinal()]); - result.setCreatedOn(input.getCreatedOn()); - result.setUserType(SUserType.values()[input.getUserType().ordinal()]); - result.setUsername(input.getUsername()); - result.setLastSeen(input.getLastSeen()); - result.setToken(input.getToken()); - result.setValidationToken(input.getValidationToken()); - result.setValidationTokenCreated(input.getValidationTokenCreated()); - result.setUuid(input.getUuid()); - List listhasRightsOn = new ArrayList(); - for (Project v : input.getHasRightsOn()) { - listhasRightsOn.add(v.getOid()); - } - result.setHasRightsOn(listhasRightsOn); - User createdByVal = input.getCreatedBy(); - result.setCreatedById(createdByVal == null ? -1 : createdByVal.getOid()); - UserSettings userSettingsVal = input.getUserSettings(); - result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid()); - List listschemas = new ArrayList(); - for (ExtendedDataSchema v : input.getSchemas()) { - listschemas.add(v.getOid()); - } - result.setSchemas(listschemas); - List listextendedData = new ArrayList(); - for (ExtendedData v : input.getExtendedData()) { - listextendedData.add(v.getOid()); - } - result.setExtendedData(listextendedData); - List listservices = new ArrayList(); - for (Service v : input.getServices()) { - listservices.add(v.getOid()); - } - result.setServices(listservices); - List listlogs = new ArrayList(); - for (UserRelated v : input.getLogs()) { - listlogs.add(v.getOid()); - } - result.setLogs(listlogs); - List listoAuthAuthorizationCodes = new ArrayList(); - for (OAuthAuthorizationCode v : input.getOAuthAuthorizationCodes()) { - listoAuthAuthorizationCodes.add(v.getOid()); - } - result.setOAuthAuthorizationCodes(listoAuthAuthorizationCodes); - List listoAuthIssuedAuthorizationCodes = new ArrayList(); - for (OAuthAuthorizationCode v : input.getOAuthIssuedAuthorizationCodes()) { - listoAuthIssuedAuthorizationCodes.add(v.getOid()); + List listactions = new ArrayList(); + for (LogAction v : input.getActions()) { + listactions.add(v.getOid()); } - result.setOAuthIssuedAuthorizationCodes(listoAuthIssuedAuthorizationCodes); + result.setActions(listactions); return result; } - public User convertFromSObject(SUser input, DatabaseSession session) throws BimserverDatabaseException { + public ServerLog convertFromSObject(SServerLog input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - User result = convertFromSObject(input, StoreFactory.eINSTANCE.createUser(), session); + ServerLog result = convertFromSObject(input, LogFactory.eINSTANCE.createServerLog(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -353,161 +259,89 @@ public User convertFromSObject(SUser input, DatabaseSession session) throws Bims return result; } - public User convertFromSObject(SUser input) throws BimserverDatabaseException { - User result = convertFromSObject(input, StoreFactory.eINSTANCE.createUser(), null); + public ServerLog convertFromSObject(SServerLog input) throws BimserverDatabaseException { + ServerLog result = convertFromSObject(input, LogFactory.eINSTANCE.createServerLog(), null); return result; } - public User convertFromSObject(SUser input, User result, DatabaseSession session) throws BimserverDatabaseException { + public ServerLog convertFromSObject(SServerLog input, ServerLog result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setName(input.getName()); - result.setPasswordHash(input.getPasswordHash()); - result.setPasswordSalt(input.getPasswordSalt()); - result.setState(ObjectState.values()[input.getState().ordinal()]); - result.setCreatedOn(input.getCreatedOn()); - result.setUserType(UserType.values()[input.getUserType().ordinal()]); - result.setUsername(input.getUsername()); - result.setLastSeen(input.getLastSeen()); - result.setToken(input.getToken()); - result.setValidationToken(input.getValidationToken()); - result.setValidationTokenCreated(input.getValidationTokenCreated()); - result.setUuid(input.getUuid()); - List listhasRightsOn = result.getHasRightsOn(); - for (long oid : input.getHasRightsOn()) { - listhasRightsOn.add((Project)session.get(StorePackage.eINSTANCE.getProject(), oid, OldQuery.getDefault())); - } - result.setCreatedBy((User)session.get(StorePackage.eINSTANCE.getUser(), input.getCreatedById(), OldQuery.getDefault())); - result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault())); - List listschemas = result.getSchemas(); - for (long oid : input.getSchemas()) { - listschemas.add((ExtendedDataSchema)session.get(StorePackage.eINSTANCE.getExtendedDataSchema(), oid, OldQuery.getDefault())); - } - List listextendedData = result.getExtendedData(); - for (long oid : input.getExtendedData()) { - listextendedData.add((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), oid, OldQuery.getDefault())); - } - List listservices = result.getServices(); - for (long oid : input.getServices()) { - listservices.add((Service)session.get(StorePackage.eINSTANCE.getService(), oid, OldQuery.getDefault())); - } - List listlogs = result.getLogs(); - for (long oid : input.getLogs()) { - listlogs.add((UserRelated)session.get(LogPackage.eINSTANCE.getUserRelated(), oid, OldQuery.getDefault())); - } - List listoAuthAuthorizationCodes = result.getOAuthAuthorizationCodes(); - for (long oid : input.getOAuthAuthorizationCodes()) { - listoAuthAuthorizationCodes.add((OAuthAuthorizationCode)session.get(StorePackage.eINSTANCE.getOAuthAuthorizationCode(), oid, OldQuery.getDefault())); - } - List listoAuthIssuedAuthorizationCodes = result.getOAuthIssuedAuthorizationCodes(); - for (long oid : input.getOAuthIssuedAuthorizationCodes()) { - listoAuthIssuedAuthorizationCodes.add((OAuthAuthorizationCode)session.get(StorePackage.eINSTANCE.getOAuthAuthorizationCode(), oid, OldQuery.getDefault())); + List listactions = result.getActions(); + for (long oid : input.getActions()) { + listactions.add((LogAction)session.get(LogPackage.eINSTANCE.getLogAction(), oid, OldQuery.getDefault())); } return result; } - public Set convertToSSetRevision(Collection input) { - Set result = new HashSet(); - for (Revision o : input) { + public Set convertToSSetProjectRelated(Collection input) { + Set result = new HashSet(); + for (ProjectRelated o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetRevision(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SRevision o : input) { + public Set convertFromSSetProjectRelated(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SProjectRelated o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListRevision(Collection input) { - List result = new ArrayList(); - for (Revision o : input) { + public List convertToSListProjectRelated(Collection input) { + List result = new ArrayList(); + for (ProjectRelated o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListRevision(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SRevision o : input) { + public List convertFromSListProjectRelated(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SProjectRelated o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SRevision convertToSObject(Revision input) { + public SProjectRelated convertToSObject(ProjectRelated input) { if (input == null) { return null; } - SRevision result = new SRevision(); + if (input instanceof NewProjectAdded) { + return convertToSObject((NewProjectAdded)input); + } + else if (input instanceof ProjectUndeleted) { + return convertToSObject((ProjectUndeleted)input); + } + else if (input instanceof ProjectDeleted) { + return convertToSObject((ProjectDeleted)input); + } + else if (input instanceof ProjectUpdated) { + return convertToSObject((ProjectUpdated)input); + } + SProjectRelated result = new SProjectRelated(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setId(input.getId()); result.setDate(input.getDate()); - result.setComment(input.getComment()); - result.setSize(input.getSize()); - result.setTag(input.getTag()); - result.setLastError(input.getLastError()); - result.setBmi(input.getBmi()); - result.setHasGeometry(input.isHasGeometry()); - result.setNrPrimitives(input.getNrPrimitives()); - User userVal = input.getUser(); - result.setUserId(userVal == null ? -1 : userVal.getOid()); - List listconcreteRevisions = new ArrayList(); - for (ConcreteRevision v : input.getConcreteRevisions()) { - listconcreteRevisions.add(v.getOid()); - } - result.setConcreteRevisions(listconcreteRevisions); - ConcreteRevision lastConcreteRevisionVal = input.getLastConcreteRevision(); - result.setLastConcreteRevisionId(lastConcreteRevisionVal == null ? -1 : lastConcreteRevisionVal.getOid()); - List listcheckouts = new ArrayList(); - for (Checkout v : input.getCheckouts()) { - listcheckouts.add(v.getOid()); - } - result.setCheckouts(listcheckouts); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); Project projectVal = input.getProject(); result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); - List listextendedData = new ArrayList(); - for (ExtendedData v : input.getExtendedData()) { - listextendedData.add(v.getOid()); - } - result.setExtendedData(listextendedData); - List listlogs = new ArrayList(); - for (RevisionRelated v : input.getLogs()) { - listlogs.add(v.getOid()); - } - result.setLogs(listlogs); - Service serviceVal = input.getService(); - result.setServiceId(serviceVal == null ? -1 : serviceVal.getOid()); - Bounds boundsVal = input.getBounds(); - result.setBounds(convertToSObject(boundsVal)); - Bounds boundsUntransformedVal = input.getBoundsUntransformed(); - result.setBoundsUntransformed(convertToSObject(boundsUntransformedVal)); - Bounds boundsMmVal = input.getBoundsMm(); - result.setBoundsMm(convertToSObject(boundsMmVal)); - Bounds boundsUntransformedMmVal = input.getBoundsUntransformedMm(); - result.setBoundsUntransformedMm(convertToSObject(boundsUntransformedMmVal)); - List listservicesLinked = new ArrayList(); - for (NewService v : input.getServicesLinked()) { - listservicesLinked.add(v.getOid()); - } - result.setServicesLinked(listservicesLinked); - DensityCollection densityCollectionVal = input.getDensityCollection(); - result.setDensityCollectionId(densityCollectionVal == null ? -1 : densityCollectionVal.getOid()); return result; } - public Revision convertFromSObject(SRevision input, DatabaseSession session) throws BimserverDatabaseException { + public ProjectRelated convertFromSObject(SProjectRelated input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - Revision result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevision(), session); + ProjectRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectRelated(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -515,132 +349,92 @@ public Revision convertFromSObject(SRevision input, DatabaseSession session) thr return result; } - public Revision convertFromSObject(SRevision input) throws BimserverDatabaseException { - Revision result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevision(), null); + public ProjectRelated convertFromSObject(SProjectRelated input) throws BimserverDatabaseException { + ProjectRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectRelated(), null); return result; } - public Revision convertFromSObject(SRevision input, Revision result, DatabaseSession session) throws BimserverDatabaseException { + public ProjectRelated convertFromSObject(SProjectRelated input, ProjectRelated result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setId(input.getId()); - result.setDate(input.getDate()); - result.setComment(input.getComment()); - result.setSize(input.getSize()); - result.setTag(input.getTag()); - result.setLastError(input.getLastError()); - result.setBmi(input.getBmi()); - result.setHasGeometry(input.isHasGeometry()); - result.setNrPrimitives(input.getNrPrimitives()); - result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); - List listconcreteRevisions = result.getConcreteRevisions(); - for (long oid : input.getConcreteRevisions()) { - listconcreteRevisions.add((ConcreteRevision)session.get(StorePackage.eINSTANCE.getConcreteRevision(), oid, OldQuery.getDefault())); + if (input instanceof SNewProjectAdded) { + return convertFromSObject((SNewProjectAdded)input, session); } - result.setLastConcreteRevision((ConcreteRevision)session.get(StorePackage.eINSTANCE.getConcreteRevision(), input.getLastConcreteRevisionId(), OldQuery.getDefault())); - List listcheckouts = result.getCheckouts(); - for (long oid : input.getCheckouts()) { - listcheckouts.add((Checkout)session.get(StorePackage.eINSTANCE.getCheckout(), oid, OldQuery.getDefault())); + else if (input instanceof SProjectUndeleted) { + return convertFromSObject((SProjectUndeleted)input, session); } - result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); - List listextendedData = result.getExtendedData(); - for (long oid : input.getExtendedData()) { - listextendedData.add((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), oid, OldQuery.getDefault())); + else if (input instanceof SProjectDeleted) { + return convertFromSObject((SProjectDeleted)input, session); } - List listlogs = result.getLogs(); - for (long oid : input.getLogs()) { - listlogs.add((RevisionRelated)session.get(LogPackage.eINSTANCE.getRevisionRelated(), oid, OldQuery.getDefault())); + else if (input instanceof SProjectUpdated) { + return convertFromSObject((SProjectUpdated)input, session); } - result.setService((Service)session.get(StorePackage.eINSTANCE.getService(), input.getServiceId(), OldQuery.getDefault())); - result.setBounds(convertFromSObject(input.getBounds(), session)); - result.setBoundsUntransformed(convertFromSObject(input.getBoundsUntransformed(), session)); - result.setBoundsMm(convertFromSObject(input.getBoundsMm(), session)); - result.setBoundsUntransformedMm(convertFromSObject(input.getBoundsUntransformedMm(), session)); - List listservicesLinked = result.getServicesLinked(); - for (long oid : input.getServicesLinked()) { - listservicesLinked.add((NewService)session.get(StorePackage.eINSTANCE.getNewService(), oid, OldQuery.getDefault())); - } - result.setDensityCollection((DensityCollection)session.get(StorePackage.eINSTANCE.getDensityCollection(), input.getDensityCollectionId(), OldQuery.getDefault())); + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); return result; } - public Set convertToSSetConcreteRevision(Collection input) { - Set result = new HashSet(); - for (ConcreteRevision o : input) { + public Set convertToSSetCheckoutRelated(Collection input) { + Set result = new HashSet(); + for (CheckoutRelated o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetConcreteRevision(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SConcreteRevision o : input) { + public Set convertFromSSetCheckoutRelated(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SCheckoutRelated o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListConcreteRevision(Collection input) { - List result = new ArrayList(); - for (ConcreteRevision o : input) { + public List convertToSListCheckoutRelated(Collection input) { + List result = new ArrayList(); + for (CheckoutRelated o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListConcreteRevision(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SConcreteRevision o : input) { + public List convertFromSListCheckoutRelated(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SCheckoutRelated o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SConcreteRevision convertToSObject(ConcreteRevision input) { + public SCheckoutRelated convertToSObject(CheckoutRelated input) { if (input == null) { return null; } - SConcreteRevision result = new SConcreteRevision(); + if (input instanceof NewCheckoutAdded) { + return convertToSObject((NewCheckoutAdded)input); + } + SCheckoutRelated result = new SCheckoutRelated(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setId(input.getId()); - result.setChecksum(input.getChecksum()); - result.setSize(input.getSize()); result.setDate(input.getDate()); - result.setLastError(input.getLastError()); - result.setClear(input.isClear()); - result.setOidCounters(input.getOidCounters()); - result.setMultiplierToMm(input.getMultiplierToMm()); - Project projectVal = input.getProject(); - result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); - List listrevisions = new ArrayList(); - for (Revision v : input.getRevisions()) { - listrevisions.add(v.getOid()); - } - result.setRevisions(listrevisions); - RevisionSummary summaryVal = input.getSummary(); - result.setSummaryId(summaryVal == null ? -1 : summaryVal.getOid()); - User userVal = input.getUser(); - result.setUserId(userVal == null ? -1 : userVal.getOid()); - IfcHeader ifcHeaderVal = input.getIfcHeader(); - result.setIfcHeaderId(ifcHeaderVal == null ? -1 : ifcHeaderVal.getOid()); - Bounds boundsVal = input.getBounds(); - result.setBounds(convertToSObject(boundsVal)); - Bounds boundsUntransformedVal = input.getBoundsUntransformed(); - result.setBoundsUntransformed(convertToSObject(boundsUntransformedVal)); - DensityCollection densityCollectionVal = input.getDensityCollection(); - result.setDensityCollectionId(densityCollectionVal == null ? -1 : densityCollectionVal.getOid()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + Checkout checkoutVal = input.getCheckout(); + result.setCheckoutId(checkoutVal == null ? -1 : checkoutVal.getOid()); return result; } - public ConcreteRevision convertFromSObject(SConcreteRevision input, DatabaseSession session) throws BimserverDatabaseException { + public CheckoutRelated convertFromSObject(SCheckoutRelated input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ConcreteRevision result = convertFromSObject(input, StoreFactory.eINSTANCE.createConcreteRevision(), session); + CheckoutRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createCheckoutRelated(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -648,97 +442,86 @@ public ConcreteRevision convertFromSObject(SConcreteRevision input, DatabaseSess return result; } - public ConcreteRevision convertFromSObject(SConcreteRevision input) throws BimserverDatabaseException { - ConcreteRevision result = convertFromSObject(input, StoreFactory.eINSTANCE.createConcreteRevision(), null); + public CheckoutRelated convertFromSObject(SCheckoutRelated input) throws BimserverDatabaseException { + CheckoutRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createCheckoutRelated(), null); return result; } - public ConcreteRevision convertFromSObject(SConcreteRevision input, ConcreteRevision result, DatabaseSession session) throws BimserverDatabaseException { + public CheckoutRelated convertFromSObject(SCheckoutRelated input, CheckoutRelated result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setId(input.getId()); - result.setChecksum(input.getChecksum()); - result.setSize(input.getSize()); - result.setDate(input.getDate()); - result.setLastError(input.getLastError()); - result.setClear(input.isClear()); - result.setOidCounters(input.getOidCounters()); - result.setMultiplierToMm(input.getMultiplierToMm()); - result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); - List listrevisions = result.getRevisions(); - for (long oid : input.getRevisions()) { - listrevisions.add((Revision)session.get(StorePackage.eINSTANCE.getRevision(), oid, OldQuery.getDefault())); + if (input instanceof SNewCheckoutAdded) { + return convertFromSObject((SNewCheckoutAdded)input, session); } - result.setSummary((RevisionSummary)session.get(StorePackage.eINSTANCE.getRevisionSummary(), input.getSummaryId(), OldQuery.getDefault())); - result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); - result.setIfcHeader((IfcHeader)session.get(StorePackage.eINSTANCE.getIfcHeader(), input.getIfcHeaderId(), OldQuery.getDefault())); - result.setBounds(convertFromSObject(input.getBounds(), session)); - result.setBoundsUntransformed(convertFromSObject(input.getBoundsUntransformed(), session)); - result.setDensityCollection((DensityCollection)session.get(StorePackage.eINSTANCE.getDensityCollection(), input.getDensityCollectionId(), OldQuery.getDefault())); + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setCheckout((Checkout)session.get(StorePackage.eINSTANCE.getCheckout(), input.getCheckoutId(), OldQuery.getDefault())); return result; } - public Set convertToSSetGeoTag(Collection input) { - Set result = new HashSet(); - for (GeoTag o : input) { + public Set convertToSSetRevisionRelated(Collection input) { + Set result = new HashSet(); + for (RevisionRelated o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetGeoTag(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SGeoTag o : input) { + public Set convertFromSSetRevisionRelated(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SRevisionRelated o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListGeoTag(Collection input) { - List result = new ArrayList(); - for (GeoTag o : input) { + public List convertToSListRevisionRelated(Collection input) { + List result = new ArrayList(); + for (RevisionRelated o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListGeoTag(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SGeoTag o : input) { + public List convertFromSListRevisionRelated(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SRevisionRelated o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SGeoTag convertToSObject(GeoTag input) { + public SRevisionRelated convertToSObject(RevisionRelated input) { if (input == null) { return null; } - SGeoTag result = new SGeoTag(); + if (input instanceof RevisionUpdated) { + return convertToSObject((RevisionUpdated)input); + } + else if (input instanceof NewRevisionAdded) { + return convertToSObject((NewRevisionAdded)input); + } + SRevisionRelated result = new SRevisionRelated(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setEnabled(input.getEnabled()); - result.setX(input.getX()); - result.setY(input.getY()); - result.setZ(input.getZ()); - result.setEpsg(input.getEpsg()); - result.setDirectionAngle(input.getDirectionAngle()); - List listprojects = new ArrayList(); - for (Project v : input.getProjects()) { - listprojects.add(v.getOid()); - } - result.setProjects(listprojects); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + Revision revisionVal = input.getRevision(); + result.setRevisionId(revisionVal == null ? -1 : revisionVal.getOid()); return result; } - public GeoTag convertFromSObject(SGeoTag input, DatabaseSession session) throws BimserverDatabaseException { + public RevisionRelated convertFromSObject(SRevisionRelated input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - GeoTag result = convertFromSObject(input, StoreFactory.eINSTANCE.createGeoTag(), session); + RevisionRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionRelated(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -746,92 +529,107 @@ public GeoTag convertFromSObject(SGeoTag input, DatabaseSession session) throws return result; } - public GeoTag convertFromSObject(SGeoTag input) throws BimserverDatabaseException { - GeoTag result = convertFromSObject(input, StoreFactory.eINSTANCE.createGeoTag(), null); + public RevisionRelated convertFromSObject(SRevisionRelated input) throws BimserverDatabaseException { + RevisionRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionRelated(), null); return result; } - public GeoTag convertFromSObject(SGeoTag input, GeoTag result, DatabaseSession session) throws BimserverDatabaseException { + public RevisionRelated convertFromSObject(SRevisionRelated input, RevisionRelated result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setEnabled(input.getEnabled()); - result.setX(input.getX()); - result.setY(input.getY()); - result.setZ(input.getZ()); - result.setEpsg(input.getEpsg()); - result.setDirectionAngle(input.getDirectionAngle()); - List listprojects = result.getProjects(); - for (long oid : input.getProjects()) { - listprojects.add((Project)session.get(StorePackage.eINSTANCE.getProject(), oid, OldQuery.getDefault())); + if (input instanceof SRevisionUpdated) { + return convertFromSObject((SRevisionUpdated)input, session); + } + else if (input instanceof SNewRevisionAdded) { + return convertFromSObject((SNewRevisionAdded)input, session); } + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getRevisionId(), OldQuery.getDefault())); return result; } - public Set convertToSSetCheckout(Collection input) { - Set result = new HashSet(); - for (Checkout o : input) { + public Set convertToSSetUserRelated(Collection input) { + Set result = new HashSet(); + for (UserRelated o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetCheckout(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SCheckout o : input) { + public Set convertFromSSetUserRelated(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SUserRelated o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListCheckout(Collection input) { - List result = new ArrayList(); - for (Checkout o : input) { + public List convertToSListUserRelated(Collection input) { + List result = new ArrayList(); + for (UserRelated o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListCheckout(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SCheckout o : input) { + public List convertFromSListUserRelated(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SUserRelated o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SCheckout convertToSObject(Checkout input) { + public SUserRelated convertToSObject(UserRelated input) { if (input == null) { return null; } - SCheckout result = new SCheckout(); + if (input instanceof UserRemovedFromProject) { + return convertToSObject((UserRemovedFromProject)input); + } + else if (input instanceof UserAddedToProject) { + return convertToSObject((UserAddedToProject)input); + } + else if (input instanceof UserChanged) { + return convertToSObject((UserChanged)input); + } + else if (input instanceof PasswordReset) { + return convertToSObject((PasswordReset)input); + } + else if (input instanceof NewUserAdded) { + return convertToSObject((NewUserAdded)input); + } + else if (input instanceof UserDeleted) { + return convertToSObject((UserDeleted)input); + } + else if (input instanceof UserUndeleted) { + return convertToSObject((UserUndeleted)input); + } + else if (input instanceof PasswordChanged) { + return convertToSObject((PasswordChanged)input); + } + SUserRelated result = new SUserRelated(); result.setOid(input.getOid()); result.setRid(input.getRid()); result.setDate(input.getDate()); - result.setActive(input.getActive()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); User userVal = input.getUser(); result.setUserId(userVal == null ? -1 : userVal.getOid()); - Revision revisionVal = input.getRevision(); - result.setRevision(convertToSObject(revisionVal)); - Project projectVal = input.getProject(); - result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); - Revision checkinVal = input.getCheckin(); - result.setCheckin(convertToSObject(checkinVal)); - List listlogs = new ArrayList(); - for (CheckoutRelated v : input.getLogs()) { - listlogs.add(v.getOid()); - } - result.setLogs(listlogs); return result; } - public Checkout convertFromSObject(SCheckout input, DatabaseSession session) throws BimserverDatabaseException { + public UserRelated convertFromSObject(SUserRelated input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - Checkout result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckout(), session); + UserRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createUserRelated(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -839,115 +637,101 @@ public Checkout convertFromSObject(SCheckout input, DatabaseSession session) thr return result; } - public Checkout convertFromSObject(SCheckout input) throws BimserverDatabaseException { - Checkout result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckout(), null); + public UserRelated convertFromSObject(SUserRelated input) throws BimserverDatabaseException { + UserRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createUserRelated(), null); return result; } - public Checkout convertFromSObject(SCheckout input, Checkout result, DatabaseSession session) throws BimserverDatabaseException { + public UserRelated convertFromSObject(SUserRelated input, UserRelated result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } + if (input instanceof SUserRemovedFromProject) { + return convertFromSObject((SUserRemovedFromProject)input, session); + } + else if (input instanceof SUserAddedToProject) { + return convertFromSObject((SUserAddedToProject)input, session); + } + else if (input instanceof SUserChanged) { + return convertFromSObject((SUserChanged)input, session); + } + else if (input instanceof SPasswordReset) { + return convertFromSObject((SPasswordReset)input, session); + } + else if (input instanceof SNewUserAdded) { + return convertFromSObject((SNewUserAdded)input, session); + } + else if (input instanceof SUserDeleted) { + return convertFromSObject((SUserDeleted)input, session); + } + else if (input instanceof SUserUndeleted) { + return convertFromSObject((SUserUndeleted)input, session); + } + else if (input instanceof SPasswordChanged) { + return convertFromSObject((SPasswordChanged)input, session); + } result.setDate(input.getDate()); - result.setActive(input.getActive()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); - result.setRevision(convertFromSObject(input.getRevision(), session)); - result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); - result.setCheckin(convertFromSObject(input.getCheckin(), session)); - List listlogs = result.getLogs(); - for (long oid : input.getLogs()) { - listlogs.add((CheckoutRelated)session.get(LogPackage.eINSTANCE.getCheckoutRelated(), oid, OldQuery.getDefault())); - } return result; } - public Set convertToSSetServerSettings(Collection input) { - Set result = new HashSet(); - for (ServerSettings o : input) { + public Set convertToSSetNewUserAdded(Collection input) { + Set result = new HashSet(); + for (NewUserAdded o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetServerSettings(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SServerSettings o : input) { + public Set convertFromSSetNewUserAdded(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SNewUserAdded o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListServerSettings(Collection input) { - List result = new ArrayList(); - for (ServerSettings o : input) { + public List convertToSListNewUserAdded(Collection input) { + List result = new ArrayList(); + for (NewUserAdded o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListServerSettings(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SServerSettings o : input) { + public List convertFromSListNewUserAdded(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SNewUserAdded o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SServerSettings convertToSObject(ServerSettings input) { + public SNewUserAdded convertToSObject(NewUserAdded input) { if (input == null) { return null; } - SServerSettings result = new SServerSettings(); + SNewUserAdded result = new SNewUserAdded(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setSendConfirmationEmailAfterRegistration(input.isSendConfirmationEmailAfterRegistration()); - result.setAllowSelfRegistration(input.getAllowSelfRegistration()); - result.setAllowUsersToCreateTopLevelProjects(input.isAllowUsersToCreateTopLevelProjects()); - result.setCheckinMergingEnabled(input.getCheckinMergingEnabled()); - result.setSmtpServer(input.getSmtpServer()); - result.setEmailSenderAddress(input.getEmailSenderAddress()); - result.setEmailSenderName(input.getEmailSenderName()); - result.setSiteAddress(input.getSiteAddress()); - result.setGenerateGeometryOnCheckin(input.isGenerateGeometryOnCheckin()); - result.setAllowOnlyWhitelisted(input.isAllowOnlyWhitelisted()); - result.getWhitelistedDomains().addAll(input.getWhitelistedDomains()); - result.setHideUserListForNonAdmin(input.getHideUserListForNonAdmin()); - result.setProtocolBuffersPort(input.getProtocolBuffersPort()); - result.setCacheOutputFiles(input.getCacheOutputFiles()); - result.setServiceRepositoryUrl(input.getServiceRepositoryUrl()); - result.setSendEmailOnNewRevision(input.isSendEmailOnNewRevision()); - result.setSessionTimeOutSeconds(input.getSessionTimeOutSeconds()); - result.setSmtpUsername(input.getSmtpUsername()); - result.setSmtpPassword(input.getSmtpPassword()); - result.setSmtpPort(input.getSmtpPort()); - result.setSmtpProtocol(SSmtpProtocol.values()[input.getSmtpProtocol().ordinal()]); - result.setReuseGeometry(input.isReuseGeometry()); - result.setAllowCreateValidatedUser(input.isAllowCreateValidatedUser()); - result.setRenderEngineProcesses(input.getRenderEngineProcesses()); - result.setPluginStrictVersionChecking(input.isPluginStrictVersionChecking()); - result.setName(input.getName()); - result.setDescription(input.getDescription()); - result.setIcon(input.getIcon()); - result.setStoreLastLogin(input.isStoreLastLogin()); - result.setStoreServiceRuns(input.isStoreServiceRuns()); - result.setOptimizeMappedItems(input.isOptimizeMappedItems()); - List listwebModules = new ArrayList(); - for (WebModulePluginConfiguration v : input.getWebModules()) { - listwebModules.add(v.getOid()); - } - result.setWebModules(listwebModules); - WebModulePluginConfiguration webModuleVal = input.getWebModule(); - result.setWebModuleId(webModuleVal == null ? -1 : webModuleVal.getOid()); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + User userVal = input.getUser(); + result.setUserId(userVal == null ? -1 : userVal.getOid()); return result; } - public ServerSettings convertFromSObject(SServerSettings input, DatabaseSession session) throws BimserverDatabaseException { + public NewUserAdded convertFromSObject(SNewUserAdded input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ServerSettings result = convertFromSObject(input, StoreFactory.eINSTANCE.createServerSettings(), session); + NewUserAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewUserAdded(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -955,155 +739,79 @@ public ServerSettings convertFromSObject(SServerSettings input, DatabaseSession return result; } - public ServerSettings convertFromSObject(SServerSettings input) throws BimserverDatabaseException { - ServerSettings result = convertFromSObject(input, StoreFactory.eINSTANCE.createServerSettings(), null); + public NewUserAdded convertFromSObject(SNewUserAdded input) throws BimserverDatabaseException { + NewUserAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewUserAdded(), null); return result; } - public ServerSettings convertFromSObject(SServerSettings input, ServerSettings result, DatabaseSession session) throws BimserverDatabaseException { + public NewUserAdded convertFromSObject(SNewUserAdded input, NewUserAdded result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setSendConfirmationEmailAfterRegistration(input.isSendConfirmationEmailAfterRegistration()); - result.setAllowSelfRegistration(input.getAllowSelfRegistration()); - result.setAllowUsersToCreateTopLevelProjects(input.isAllowUsersToCreateTopLevelProjects()); - result.setCheckinMergingEnabled(input.getCheckinMergingEnabled()); - result.setSmtpServer(input.getSmtpServer()); - result.setEmailSenderAddress(input.getEmailSenderAddress()); - result.setEmailSenderName(input.getEmailSenderName()); - result.setSiteAddress(input.getSiteAddress()); - result.setGenerateGeometryOnCheckin(input.isGenerateGeometryOnCheckin()); - result.setAllowOnlyWhitelisted(input.isAllowOnlyWhitelisted()); - result.getWhitelistedDomains().addAll(input.getWhitelistedDomains()); - result.setHideUserListForNonAdmin(input.getHideUserListForNonAdmin()); - result.setProtocolBuffersPort(input.getProtocolBuffersPort()); - result.setCacheOutputFiles(input.getCacheOutputFiles()); - result.setServiceRepositoryUrl(input.getServiceRepositoryUrl()); - result.setSendEmailOnNewRevision(input.isSendEmailOnNewRevision()); - result.setSessionTimeOutSeconds(input.getSessionTimeOutSeconds()); - result.setSmtpUsername(input.getSmtpUsername()); - result.setSmtpPassword(input.getSmtpPassword()); - result.setSmtpPort(input.getSmtpPort()); - result.setSmtpProtocol(SmtpProtocol.values()[input.getSmtpProtocol().ordinal()]); - result.setReuseGeometry(input.isReuseGeometry()); - result.setAllowCreateValidatedUser(input.isAllowCreateValidatedUser()); - result.setRenderEngineProcesses(input.getRenderEngineProcesses()); - result.setPluginStrictVersionChecking(input.isPluginStrictVersionChecking()); - result.setName(input.getName()); - result.setDescription(input.getDescription()); - result.setIcon(input.getIcon()); - result.setStoreLastLogin(input.isStoreLastLogin()); - result.setStoreServiceRuns(input.isStoreServiceRuns()); - result.setOptimizeMappedItems(input.isOptimizeMappedItems()); - List listwebModules = result.getWebModules(); - for (long oid : input.getWebModules()) { - listwebModules.add((WebModulePluginConfiguration)session.get(StorePackage.eINSTANCE.getWebModulePluginConfiguration(), oid, OldQuery.getDefault())); - } - result.setWebModule((WebModulePluginConfiguration)session.get(StorePackage.eINSTANCE.getWebModulePluginConfiguration(), input.getWebModuleId(), OldQuery.getDefault())); + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); return result; } - public Set convertToSSetUserSettings(Collection input) { - Set result = new HashSet(); - for (UserSettings o : input) { + public Set convertToSSetNewProjectAdded(Collection input) { + Set result = new HashSet(); + for (NewProjectAdded o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetUserSettings(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SUserSettings o : input) { + public Set convertFromSSetNewProjectAdded(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SNewProjectAdded o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListUserSettings(Collection input) { - List result = new ArrayList(); - for (UserSettings o : input) { + public List convertToSListNewProjectAdded(Collection input) { + List result = new ArrayList(); + for (NewProjectAdded o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListUserSettings(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SUserSettings o : input) { + public List convertFromSListNewProjectAdded(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SNewProjectAdded o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SUserSettings convertToSObject(UserSettings input) { + public SNewProjectAdded convertToSObject(NewProjectAdded input) { if (input == null) { return null; } - SUserSettings result = new SUserSettings(); + SNewProjectAdded result = new SNewProjectAdded(); result.setOid(input.getOid()); result.setRid(input.getRid()); - List listserializers = new ArrayList(); - for (SerializerPluginConfiguration v : input.getSerializers()) { - listserializers.add(v.getOid()); - } - result.setSerializers(listserializers); - List listobjectIDMs = new ArrayList(); - for (ObjectIDMPluginConfiguration v : input.getObjectIDMs()) { - listobjectIDMs.add(v.getOid()); - } - result.setObjectIDMs(listobjectIDMs); - List listrenderEngines = new ArrayList(); - for (RenderEnginePluginConfiguration v : input.getRenderEngines()) { - listrenderEngines.add(v.getOid()); - } - result.setRenderEngines(listrenderEngines); - List listdeserializers = new ArrayList(); - for (DeserializerPluginConfiguration v : input.getDeserializers()) { - listdeserializers.add(v.getOid()); - } - result.setDeserializers(listdeserializers); - List listqueryEngines = new ArrayList(); - for (QueryEnginePluginConfiguration v : input.getQueryEngines()) { - listqueryEngines.add(v.getOid()); - } - result.setQueryEngines(listqueryEngines); - List listmodelMergers = new ArrayList(); - for (ModelMergerPluginConfiguration v : input.getModelMergers()) { - listmodelMergers.add(v.getOid()); - } - result.setModelMergers(listmodelMergers); - List listmodelCompares = new ArrayList(); - for (ModelComparePluginConfiguration v : input.getModelCompares()) { - listmodelCompares.add(v.getOid()); - } - result.setModelCompares(listmodelCompares); - ModelMergerPluginConfiguration defaultModelMergerVal = input.getDefaultModelMerger(); - result.setDefaultModelMergerId(defaultModelMergerVal == null ? -1 : defaultModelMergerVal.getOid()); - ModelComparePluginConfiguration defaultModelCompareVal = input.getDefaultModelCompare(); - result.setDefaultModelCompareId(defaultModelCompareVal == null ? -1 : defaultModelCompareVal.getOid()); - QueryEnginePluginConfiguration defaultQueryEngineVal = input.getDefaultQueryEngine(); - result.setDefaultQueryEngineId(defaultQueryEngineVal == null ? -1 : defaultQueryEngineVal.getOid()); - RenderEnginePluginConfiguration defaultRenderEngineVal = input.getDefaultRenderEngine(); - result.setDefaultRenderEngineId(defaultRenderEngineVal == null ? -1 : defaultRenderEngineVal.getOid()); - SerializerPluginConfiguration defaultSerializerVal = input.getDefaultSerializer(); - result.setDefaultSerializerId(defaultSerializerVal == null ? -1 : defaultSerializerVal.getOid()); - ObjectIDMPluginConfiguration defaultObjectIDMVal = input.getDefaultObjectIDM(); - result.setDefaultObjectIDMId(defaultObjectIDMVal == null ? -1 : defaultObjectIDMVal.getOid()); - List listservices = new ArrayList(); - for (InternalServicePluginConfiguration v : input.getServices()) { - listservices.add(v.getOid()); - } - result.setServices(listservices); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + Project projectVal = input.getProject(); + result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); + Project parentProjectVal = input.getParentProject(); + result.setParentProjectId(parentProjectVal == null ? -1 : parentProjectVal.getOid()); return result; } - public UserSettings convertFromSObject(SUserSettings input, DatabaseSession session) throws BimserverDatabaseException { + public NewProjectAdded convertFromSObject(SNewProjectAdded input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - UserSettings result = convertFromSObject(input, StoreFactory.eINSTANCE.createUserSettings(), session); + NewProjectAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewProjectAdded(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -1111,139 +819,80 @@ public UserSettings convertFromSObject(SUserSettings input, DatabaseSession sess return result; } - public UserSettings convertFromSObject(SUserSettings input) throws BimserverDatabaseException { - UserSettings result = convertFromSObject(input, StoreFactory.eINSTANCE.createUserSettings(), null); + public NewProjectAdded convertFromSObject(SNewProjectAdded input) throws BimserverDatabaseException { + NewProjectAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewProjectAdded(), null); return result; } - public UserSettings convertFromSObject(SUserSettings input, UserSettings result, DatabaseSession session) throws BimserverDatabaseException { + public NewProjectAdded convertFromSObject(SNewProjectAdded input, NewProjectAdded result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - List listserializers = result.getSerializers(); - for (long oid : input.getSerializers()) { - listserializers.add((SerializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getSerializerPluginConfiguration(), oid, OldQuery.getDefault())); - } - List listobjectIDMs = result.getObjectIDMs(); - for (long oid : input.getObjectIDMs()) { - listobjectIDMs.add((ObjectIDMPluginConfiguration)session.get(StorePackage.eINSTANCE.getObjectIDMPluginConfiguration(), oid, OldQuery.getDefault())); - } - List listrenderEngines = result.getRenderEngines(); - for (long oid : input.getRenderEngines()) { - listrenderEngines.add((RenderEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getRenderEnginePluginConfiguration(), oid, OldQuery.getDefault())); - } - List listdeserializers = result.getDeserializers(); - for (long oid : input.getDeserializers()) { - listdeserializers.add((DeserializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getDeserializerPluginConfiguration(), oid, OldQuery.getDefault())); - } - List listqueryEngines = result.getQueryEngines(); - for (long oid : input.getQueryEngines()) { - listqueryEngines.add((QueryEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getQueryEnginePluginConfiguration(), oid, OldQuery.getDefault())); - } - List listmodelMergers = result.getModelMergers(); - for (long oid : input.getModelMergers()) { - listmodelMergers.add((ModelMergerPluginConfiguration)session.get(StorePackage.eINSTANCE.getModelMergerPluginConfiguration(), oid, OldQuery.getDefault())); - } - List listmodelCompares = result.getModelCompares(); - for (long oid : input.getModelCompares()) { - listmodelCompares.add((ModelComparePluginConfiguration)session.get(StorePackage.eINSTANCE.getModelComparePluginConfiguration(), oid, OldQuery.getDefault())); - } - result.setDefaultModelMerger((ModelMergerPluginConfiguration)session.get(StorePackage.eINSTANCE.getModelMergerPluginConfiguration(), input.getDefaultModelMergerId(), OldQuery.getDefault())); - result.setDefaultModelCompare((ModelComparePluginConfiguration)session.get(StorePackage.eINSTANCE.getModelComparePluginConfiguration(), input.getDefaultModelCompareId(), OldQuery.getDefault())); - result.setDefaultQueryEngine((QueryEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getQueryEnginePluginConfiguration(), input.getDefaultQueryEngineId(), OldQuery.getDefault())); - result.setDefaultRenderEngine((RenderEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getRenderEnginePluginConfiguration(), input.getDefaultRenderEngineId(), OldQuery.getDefault())); - result.setDefaultSerializer((SerializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getSerializerPluginConfiguration(), input.getDefaultSerializerId(), OldQuery.getDefault())); - result.setDefaultObjectIDM((ObjectIDMPluginConfiguration)session.get(StorePackage.eINSTANCE.getObjectIDMPluginConfiguration(), input.getDefaultObjectIDMId(), OldQuery.getDefault())); - List listservices = result.getServices(); - for (long oid : input.getServices()) { - listservices.add((InternalServicePluginConfiguration)session.get(StorePackage.eINSTANCE.getInternalServicePluginConfiguration(), oid, OldQuery.getDefault())); - } + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); + result.setParentProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getParentProjectId(), OldQuery.getDefault())); return result; } - public Set convertToSSetPluginConfiguration(Collection input) { - Set result = new HashSet(); - for (PluginConfiguration o : input) { + public Set convertToSSetRevisionBranched(Collection input) { + Set result = new HashSet(); + for (RevisionBranched o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SPluginConfiguration o : input) { + public Set convertFromSSetRevisionBranched(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SRevisionBranched o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListPluginConfiguration(Collection input) { - List result = new ArrayList(); - for (PluginConfiguration o : input) { + public List convertToSListRevisionBranched(Collection input) { + List result = new ArrayList(); + for (RevisionBranched o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SPluginConfiguration o : input) { + public List convertFromSListRevisionBranched(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SRevisionBranched o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SPluginConfiguration convertToSObject(PluginConfiguration input) { + public SRevisionBranched convertToSObject(RevisionBranched input) { if (input == null) { return null; } - if (input instanceof WebModulePluginConfiguration) { - return convertToSObject((WebModulePluginConfiguration)input); - } - else if (input instanceof ModelMergerPluginConfiguration) { - return convertToSObject((ModelMergerPluginConfiguration)input); - } - else if (input instanceof ModelComparePluginConfiguration) { - return convertToSObject((ModelComparePluginConfiguration)input); - } - else if (input instanceof RenderEnginePluginConfiguration) { - return convertToSObject((RenderEnginePluginConfiguration)input); - } - else if (input instanceof ObjectIDMPluginConfiguration) { - return convertToSObject((ObjectIDMPluginConfiguration)input); - } - else if (input instanceof QueryEnginePluginConfiguration) { - return convertToSObject((QueryEnginePluginConfiguration)input); - } - else if (input instanceof InternalServicePluginConfiguration) { - return convertToSObject((InternalServicePluginConfiguration)input); - } - else if (input instanceof SerializerPluginConfiguration) { - return convertToSObject((SerializerPluginConfiguration)input); - } - else if (input instanceof DeserializerPluginConfiguration) { - return convertToSObject((DeserializerPluginConfiguration)input); - } - SPluginConfiguration result = new SPluginConfiguration(); + SRevisionBranched result = new SRevisionBranched(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setName(input.getName()); - result.setEnabled(input.getEnabled()); - result.setDescription(input.getDescription()); - PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor(); - result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid()); - ObjectType settingsVal = input.getSettings(); - result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid()); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + Revision oldrevisionVal = input.getOldrevision(); + result.setOldrevisionId(oldrevisionVal == null ? -1 : oldrevisionVal.getOid()); + Revision newrevisionVal = input.getNewrevision(); + result.setNewrevisionId(newrevisionVal == null ? -1 : newrevisionVal.getOid()); return result; } - public PluginConfiguration convertFromSObject(SPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException { + public RevisionBranched convertFromSObject(SRevisionBranched input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - PluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginConfiguration(), session); + RevisionBranched result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionBranched(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -1251,116 +900,80 @@ public PluginConfiguration convertFromSObject(SPluginConfiguration input, Databa return result; } - public PluginConfiguration convertFromSObject(SPluginConfiguration input) throws BimserverDatabaseException { - PluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginConfiguration(), null); + public RevisionBranched convertFromSObject(SRevisionBranched input) throws BimserverDatabaseException { + RevisionBranched result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionBranched(), null); return result; } - public PluginConfiguration convertFromSObject(SPluginConfiguration input, PluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException { + public RevisionBranched convertFromSObject(SRevisionBranched input, RevisionBranched result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - if (input instanceof SWebModulePluginConfiguration) { - return convertFromSObject((SWebModulePluginConfiguration)input, session); - } - else if (input instanceof SModelMergerPluginConfiguration) { - return convertFromSObject((SModelMergerPluginConfiguration)input, session); - } - else if (input instanceof SModelComparePluginConfiguration) { - return convertFromSObject((SModelComparePluginConfiguration)input, session); - } - else if (input instanceof SRenderEnginePluginConfiguration) { - return convertFromSObject((SRenderEnginePluginConfiguration)input, session); - } - else if (input instanceof SObjectIDMPluginConfiguration) { - return convertFromSObject((SObjectIDMPluginConfiguration)input, session); - } - else if (input instanceof SQueryEnginePluginConfiguration) { - return convertFromSObject((SQueryEnginePluginConfiguration)input, session); - } - else if (input instanceof SInternalServicePluginConfiguration) { - return convertFromSObject((SInternalServicePluginConfiguration)input, session); - } - else if (input instanceof SSerializerPluginConfiguration) { - return convertFromSObject((SSerializerPluginConfiguration)input, session); - } - else if (input instanceof SDeserializerPluginConfiguration) { - return convertFromSObject((SDeserializerPluginConfiguration)input, session); - } - result.setName(input.getName()); - result.setEnabled(input.getEnabled()); - result.setDescription(input.getDescription()); - result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault())); - result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault())); + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setOldrevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getOldrevisionId(), OldQuery.getDefault())); + result.setNewrevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getNewrevisionId(), OldQuery.getDefault())); return result; } - public Set convertToSSetSerializerPluginConfiguration(Collection input) { - Set result = new HashSet(); - for (SerializerPluginConfiguration o : input) { + public Set convertToSSetNewRevisionAdded(Collection input) { + Set result = new HashSet(); + for (NewRevisionAdded o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetSerializerPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SSerializerPluginConfiguration o : input) { + public Set convertFromSSetNewRevisionAdded(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SNewRevisionAdded o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListSerializerPluginConfiguration(Collection input) { - List result = new ArrayList(); - for (SerializerPluginConfiguration o : input) { + public List convertToSListNewRevisionAdded(Collection input) { + List result = new ArrayList(); + for (NewRevisionAdded o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListSerializerPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SSerializerPluginConfiguration o : input) { + public List convertFromSListNewRevisionAdded(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SNewRevisionAdded o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SSerializerPluginConfiguration convertToSObject(SerializerPluginConfiguration input) { + public SNewRevisionAdded convertToSObject(NewRevisionAdded input) { if (input == null) { return null; } - if (input instanceof MessagingSerializerPluginConfiguration) { - return convertToSObject((MessagingSerializerPluginConfiguration)input); - } - SSerializerPluginConfiguration result = new SSerializerPluginConfiguration(); + SNewRevisionAdded result = new SNewRevisionAdded(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setName(input.getName()); - result.setEnabled(input.getEnabled()); - result.setDescription(input.getDescription()); - result.setStreaming(input.isStreaming()); - PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor(); - result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid()); - ObjectType settingsVal = input.getSettings(); - result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid()); - ObjectIDMPluginConfiguration objectIDMVal = input.getObjectIDM(); - result.setObjectIDMId(objectIDMVal == null ? -1 : objectIDMVal.getOid()); - UserSettings userSettingsVal = input.getUserSettings(); - result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid()); - RenderEnginePluginConfiguration renderEngineVal = input.getRenderEngine(); - result.setRenderEngineId(renderEngineVal == null ? -1 : renderEngineVal.getOid()); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + Revision revisionVal = input.getRevision(); + result.setRevisionId(revisionVal == null ? -1 : revisionVal.getOid()); + Project projectVal = input.getProject(); + result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); return result; } - public SerializerPluginConfiguration convertFromSObject(SSerializerPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException { + public NewRevisionAdded convertFromSObject(SNewRevisionAdded input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - SerializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createSerializerPluginConfiguration(), session); + NewRevisionAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewRevisionAdded(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -1368,93 +981,78 @@ public SerializerPluginConfiguration convertFromSObject(SSerializerPluginConfigu return result; } - public SerializerPluginConfiguration convertFromSObject(SSerializerPluginConfiguration input) throws BimserverDatabaseException { - SerializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createSerializerPluginConfiguration(), null); + public NewRevisionAdded convertFromSObject(SNewRevisionAdded input) throws BimserverDatabaseException { + NewRevisionAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewRevisionAdded(), null); return result; } - public SerializerPluginConfiguration convertFromSObject(SSerializerPluginConfiguration input, SerializerPluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException { + public NewRevisionAdded convertFromSObject(SNewRevisionAdded input, NewRevisionAdded result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - if (input instanceof SMessagingSerializerPluginConfiguration) { - return convertFromSObject((SMessagingSerializerPluginConfiguration)input, session); - } - result.setName(input.getName()); - result.setEnabled(input.getEnabled()); - result.setDescription(input.getDescription()); - result.setStreaming(input.isStreaming()); - result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault())); - result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault())); - result.setObjectIDM((ObjectIDMPluginConfiguration)session.get(StorePackage.eINSTANCE.getObjectIDMPluginConfiguration(), input.getObjectIDMId(), OldQuery.getDefault())); - result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault())); - result.setRenderEngine((RenderEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getRenderEnginePluginConfiguration(), input.getRenderEngineId(), OldQuery.getDefault())); + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getRevisionId(), OldQuery.getDefault())); + result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); return result; } - public Set convertToSSetObjectIDMPluginConfiguration(Collection input) { - Set result = new HashSet(); - for (ObjectIDMPluginConfiguration o : input) { + public Set convertToSSetNewCheckoutAdded(Collection input) { + Set result = new HashSet(); + for (NewCheckoutAdded o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetObjectIDMPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SObjectIDMPluginConfiguration o : input) { + public Set convertFromSSetNewCheckoutAdded(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SNewCheckoutAdded o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListObjectIDMPluginConfiguration(Collection input) { - List result = new ArrayList(); - for (ObjectIDMPluginConfiguration o : input) { + public List convertToSListNewCheckoutAdded(Collection input) { + List result = new ArrayList(); + for (NewCheckoutAdded o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListObjectIDMPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SObjectIDMPluginConfiguration o : input) { + public List convertFromSListNewCheckoutAdded(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SNewCheckoutAdded o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SObjectIDMPluginConfiguration convertToSObject(ObjectIDMPluginConfiguration input) { + public SNewCheckoutAdded convertToSObject(NewCheckoutAdded input) { if (input == null) { return null; } - SObjectIDMPluginConfiguration result = new SObjectIDMPluginConfiguration(); + SNewCheckoutAdded result = new SNewCheckoutAdded(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setName(input.getName()); - result.setEnabled(input.getEnabled()); - result.setDescription(input.getDescription()); - PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor(); - result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid()); - ObjectType settingsVal = input.getSettings(); - result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid()); - List listserializers = new ArrayList(); - for (SerializerPluginConfiguration v : input.getSerializers()) { - listserializers.add(v.getOid()); - } - result.setSerializers(listserializers); - UserSettings userSettingsVal = input.getUserSettings(); - result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid()); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + Checkout checkoutVal = input.getCheckout(); + result.setCheckoutId(checkoutVal == null ? -1 : checkoutVal.getOid()); return result; } - public ObjectIDMPluginConfiguration convertFromSObject(SObjectIDMPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException { + public NewCheckoutAdded convertFromSObject(SNewCheckoutAdded input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ObjectIDMPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectIDMPluginConfiguration(), session); + NewCheckoutAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewCheckoutAdded(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -1462,91 +1060,75 @@ public ObjectIDMPluginConfiguration convertFromSObject(SObjectIDMPluginConfigura return result; } - public ObjectIDMPluginConfiguration convertFromSObject(SObjectIDMPluginConfiguration input) throws BimserverDatabaseException { - ObjectIDMPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectIDMPluginConfiguration(), null); + public NewCheckoutAdded convertFromSObject(SNewCheckoutAdded input) throws BimserverDatabaseException { + NewCheckoutAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewCheckoutAdded(), null); return result; } - public ObjectIDMPluginConfiguration convertFromSObject(SObjectIDMPluginConfiguration input, ObjectIDMPluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException { + public NewCheckoutAdded convertFromSObject(SNewCheckoutAdded input, NewCheckoutAdded result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setName(input.getName()); - result.setEnabled(input.getEnabled()); - result.setDescription(input.getDescription()); - result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault())); - result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault())); - List listserializers = result.getSerializers(); - for (long oid : input.getSerializers()) { - listserializers.add((SerializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getSerializerPluginConfiguration(), oid, OldQuery.getDefault())); - } - result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault())); + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setCheckout((Checkout)session.get(StorePackage.eINSTANCE.getCheckout(), input.getCheckoutId(), OldQuery.getDefault())); return result; } - public Set convertToSSetRenderEnginePluginConfiguration(Collection input) { - Set result = new HashSet(); - for (RenderEnginePluginConfiguration o : input) { + public Set convertToSSetSettingsSaved(Collection input) { + Set result = new HashSet(); + for (SettingsSaved o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetRenderEnginePluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SRenderEnginePluginConfiguration o : input) { + public Set convertFromSSetSettingsSaved(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SSettingsSaved o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListRenderEnginePluginConfiguration(Collection input) { - List result = new ArrayList(); - for (RenderEnginePluginConfiguration o : input) { + public List convertToSListSettingsSaved(Collection input) { + List result = new ArrayList(); + for (SettingsSaved o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListRenderEnginePluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SRenderEnginePluginConfiguration o : input) { + public List convertFromSListSettingsSaved(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SSettingsSaved o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SRenderEnginePluginConfiguration convertToSObject(RenderEnginePluginConfiguration input) { + public SSettingsSaved convertToSObject(SettingsSaved input) { if (input == null) { return null; } - SRenderEnginePluginConfiguration result = new SRenderEnginePluginConfiguration(); + SSettingsSaved result = new SSettingsSaved(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setName(input.getName()); - result.setEnabled(input.getEnabled()); - result.setDescription(input.getDescription()); - PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor(); - result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid()); - ObjectType settingsVal = input.getSettings(); - result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid()); - List listserializers = new ArrayList(); - for (SerializerPluginConfiguration v : input.getSerializers()) { - listserializers.add(v.getOid()); - } - result.setSerializers(listserializers); - UserSettings userSettingsVal = input.getUserSettings(); - result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid()); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); return result; } - public RenderEnginePluginConfiguration convertFromSObject(SRenderEnginePluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException { + public SettingsSaved convertFromSObject(SSettingsSaved input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - RenderEnginePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createRenderEnginePluginConfiguration(), session); + SettingsSaved result = convertFromSObject(input, LogFactory.eINSTANCE.createSettingsSaved(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -1554,86 +1136,78 @@ public RenderEnginePluginConfiguration convertFromSObject(SRenderEnginePluginCon return result; } - public RenderEnginePluginConfiguration convertFromSObject(SRenderEnginePluginConfiguration input) throws BimserverDatabaseException { - RenderEnginePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createRenderEnginePluginConfiguration(), null); + public SettingsSaved convertFromSObject(SSettingsSaved input) throws BimserverDatabaseException { + SettingsSaved result = convertFromSObject(input, LogFactory.eINSTANCE.createSettingsSaved(), null); return result; } - public RenderEnginePluginConfiguration convertFromSObject(SRenderEnginePluginConfiguration input, RenderEnginePluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException { + public SettingsSaved convertFromSObject(SSettingsSaved input, SettingsSaved result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setName(input.getName()); - result.setEnabled(input.getEnabled()); - result.setDescription(input.getDescription()); - result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault())); - result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault())); - List listserializers = result.getSerializers(); - for (long oid : input.getSerializers()) { - listserializers.add((SerializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getSerializerPluginConfiguration(), oid, OldQuery.getDefault())); - } - result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault())); + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); return result; } - public Set convertToSSetDeserializerPluginConfiguration(Collection input) { - Set result = new HashSet(); - for (DeserializerPluginConfiguration o : input) { + public Set convertToSSetUserAddedToProject(Collection input) { + Set result = new HashSet(); + for (UserAddedToProject o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetDeserializerPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SDeserializerPluginConfiguration o : input) { + public Set convertFromSSetUserAddedToProject(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SUserAddedToProject o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListDeserializerPluginConfiguration(Collection input) { - List result = new ArrayList(); - for (DeserializerPluginConfiguration o : input) { + public List convertToSListUserAddedToProject(Collection input) { + List result = new ArrayList(); + for (UserAddedToProject o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListDeserializerPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SDeserializerPluginConfiguration o : input) { + public List convertFromSListUserAddedToProject(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SUserAddedToProject o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SDeserializerPluginConfiguration convertToSObject(DeserializerPluginConfiguration input) { + public SUserAddedToProject convertToSObject(UserAddedToProject input) { if (input == null) { return null; } - SDeserializerPluginConfiguration result = new SDeserializerPluginConfiguration(); + SUserAddedToProject result = new SUserAddedToProject(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setName(input.getName()); - result.setEnabled(input.getEnabled()); - result.setDescription(input.getDescription()); - PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor(); - result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid()); - ObjectType settingsVal = input.getSettings(); - result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid()); - UserSettings userSettingsVal = input.getUserSettings(); - result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid()); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + User userVal = input.getUser(); + result.setUserId(userVal == null ? -1 : userVal.getOid()); + Project projectVal = input.getProject(); + result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); return result; } - public DeserializerPluginConfiguration convertFromSObject(SDeserializerPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException { + public UserAddedToProject convertFromSObject(SUserAddedToProject input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - DeserializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createDeserializerPluginConfiguration(), session); + UserAddedToProject result = convertFromSObject(input, LogFactory.eINSTANCE.createUserAddedToProject(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -1641,80 +1215,76 @@ public DeserializerPluginConfiguration convertFromSObject(SDeserializerPluginCon return result; } - public DeserializerPluginConfiguration convertFromSObject(SDeserializerPluginConfiguration input) throws BimserverDatabaseException { - DeserializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createDeserializerPluginConfiguration(), null); + public UserAddedToProject convertFromSObject(SUserAddedToProject input) throws BimserverDatabaseException { + UserAddedToProject result = convertFromSObject(input, LogFactory.eINSTANCE.createUserAddedToProject(), null); return result; } - public DeserializerPluginConfiguration convertFromSObject(SDeserializerPluginConfiguration input, DeserializerPluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException { + public UserAddedToProject convertFromSObject(SUserAddedToProject input, UserAddedToProject result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setName(input.getName()); - result.setEnabled(input.getEnabled()); - result.setDescription(input.getDescription()); - result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault())); - result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault())); - result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault())); + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); + result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); return result; } - public Set convertToSSetDownloadResult(Collection input) { - Set result = new HashSet(); - for (DownloadResult o : input) { + public Set convertToSSetNewObjectIDMUploaded(Collection input) { + Set result = new HashSet(); + for (NewObjectIDMUploaded o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetDownloadResult(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SDownloadResult o : input) { + public Set convertFromSSetNewObjectIDMUploaded(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SNewObjectIDMUploaded o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListDownloadResult(Collection input) { - List result = new ArrayList(); - for (DownloadResult o : input) { + public List convertToSListNewObjectIDMUploaded(Collection input) { + List result = new ArrayList(); + for (NewObjectIDMUploaded o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListDownloadResult(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SDownloadResult o : input) { + public List convertFromSListNewObjectIDMUploaded(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SNewObjectIDMUploaded o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SDownloadResult convertToSObject(DownloadResult input) { + public SNewObjectIDMUploaded convertToSObject(NewObjectIDMUploaded input) { if (input == null) { return null; } - if (input instanceof CheckoutResult) { - return convertToSObject((CheckoutResult)input); - } - SDownloadResult result = new SDownloadResult(); + SNewObjectIDMUploaded result = new SNewObjectIDMUploaded(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setProjectName(input.getProjectName()); - result.setRevisionNr(input.getRevisionNr()); - result.setFile(input.getFile()); - result.setSerializerOid(input.getSerializerOid()); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); return result; } - public DownloadResult convertFromSObject(SDownloadResult input, DatabaseSession session) throws BimserverDatabaseException { + public NewObjectIDMUploaded convertFromSObject(SNewObjectIDMUploaded input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - DownloadResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createDownloadResult(), session); + NewObjectIDMUploaded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewObjectIDMUploaded(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -1722,78 +1292,74 @@ public DownloadResult convertFromSObject(SDownloadResult input, DatabaseSession return result; } - public DownloadResult convertFromSObject(SDownloadResult input) throws BimserverDatabaseException { - DownloadResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createDownloadResult(), null); + public NewObjectIDMUploaded convertFromSObject(SNewObjectIDMUploaded input) throws BimserverDatabaseException { + NewObjectIDMUploaded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewObjectIDMUploaded(), null); return result; } - public DownloadResult convertFromSObject(SDownloadResult input, DownloadResult result, DatabaseSession session) throws BimserverDatabaseException { + public NewObjectIDMUploaded convertFromSObject(SNewObjectIDMUploaded input, NewObjectIDMUploaded result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - if (input instanceof SCheckoutResult) { - return convertFromSObject((SCheckoutResult)input, session); - } - result.setProjectName(input.getProjectName()); - result.setRevisionNr(input.getRevisionNr()); - result.setFile(input.getFile()); - result.setSerializerOid(input.getSerializerOid()); - return result; + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + return result; } - public Set convertToSSetCheckoutResult(Collection input) { - Set result = new HashSet(); - for (CheckoutResult o : input) { + public Set convertToSSetDownload(Collection input) { + Set result = new HashSet(); + for (Download o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetCheckoutResult(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SCheckoutResult o : input) { + public Set convertFromSSetDownload(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SDownload o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListCheckoutResult(Collection input) { - List result = new ArrayList(); - for (CheckoutResult o : input) { + public List convertToSListDownload(Collection input) { + List result = new ArrayList(); + for (Download o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListCheckoutResult(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SCheckoutResult o : input) { + public List convertFromSListDownload(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SDownload o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SCheckoutResult convertToSObject(CheckoutResult input) { + public SDownload convertToSObject(Download input) { if (input == null) { return null; } - SCheckoutResult result = new SCheckoutResult(); + SDownload result = new SDownload(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setProjectName(input.getProjectName()); - result.setRevisionNr(input.getRevisionNr()); - result.setFile(input.getFile()); - result.setSerializerOid(input.getSerializerOid()); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); return result; } - public CheckoutResult convertFromSObject(SCheckoutResult input, DatabaseSession session) throws BimserverDatabaseException { + public Download convertFromSObject(SDownload input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - CheckoutResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckoutResult(), session); + Download result = convertFromSObject(input, LogFactory.eINSTANCE.createDownload(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -1801,81 +1367,78 @@ public CheckoutResult convertFromSObject(SCheckoutResult input, DatabaseSession return result; } - public CheckoutResult convertFromSObject(SCheckoutResult input) throws BimserverDatabaseException { - CheckoutResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckoutResult(), null); + public Download convertFromSObject(SDownload input) throws BimserverDatabaseException { + Download result = convertFromSObject(input, LogFactory.eINSTANCE.createDownload(), null); return result; } - public CheckoutResult convertFromSObject(SCheckoutResult input, CheckoutResult result, DatabaseSession session) throws BimserverDatabaseException { + public Download convertFromSObject(SDownload input, Download result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setProjectName(input.getProjectName()); - result.setRevisionNr(input.getRevisionNr()); - result.setFile(input.getFile()); - result.setSerializerOid(input.getSerializerOid()); + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); return result; } - public Set convertToSSetDataValue(Collection input) { - Set result = new HashSet(); - for (DataValue o : input) { + public Set convertToSSetUserRemovedFromProject(Collection input) { + Set result = new HashSet(); + for (UserRemovedFromProject o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetDataValue(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SDataValue o : input) { + public Set convertFromSSetUserRemovedFromProject(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SUserRemovedFromProject o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListDataValue(Collection input) { - List result = new ArrayList(); - for (DataValue o : input) { + public List convertToSListUserRemovedFromProject(Collection input) { + List result = new ArrayList(); + for (UserRemovedFromProject o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListDataValue(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SDataValue o : input) { + public List convertFromSListUserRemovedFromProject(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SUserRemovedFromProject o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SDataValue convertToSObject(DataValue input) { + public SUserRemovedFromProject convertToSObject(UserRemovedFromProject input) { if (input == null) { return null; } - if (input instanceof ListDataValue) { - return convertToSObject((ListDataValue)input); - } - else if (input instanceof SimpleDataValue) { - return convertToSObject((SimpleDataValue)input); - } - else if (input instanceof ReferenceDataValue) { - return convertToSObject((ReferenceDataValue)input); - } - SDataValue result = new SDataValue(); + SUserRemovedFromProject result = new SUserRemovedFromProject(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setFieldName(input.getFieldName()); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + User userVal = input.getUser(); + result.setUserId(userVal == null ? -1 : userVal.getOid()); + Project projectVal = input.getProject(); + result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); return result; } - public DataValue convertFromSObject(SDataValue input, DatabaseSession session) throws BimserverDatabaseException { + public UserRemovedFromProject convertFromSObject(SUserRemovedFromProject input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - DataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createDataValue(), session); + UserRemovedFromProject result = convertFromSObject(input, LogFactory.eINSTANCE.createUserRemovedFromProject(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -1883,85 +1446,78 @@ public DataValue convertFromSObject(SDataValue input, DatabaseSession session) t return result; } - public DataValue convertFromSObject(SDataValue input) throws BimserverDatabaseException { - DataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createDataValue(), null); + public UserRemovedFromProject convertFromSObject(SUserRemovedFromProject input) throws BimserverDatabaseException { + UserRemovedFromProject result = convertFromSObject(input, LogFactory.eINSTANCE.createUserRemovedFromProject(), null); return result; } - public DataValue convertFromSObject(SDataValue input, DataValue result, DatabaseSession session) throws BimserverDatabaseException { + public UserRemovedFromProject convertFromSObject(SUserRemovedFromProject input, UserRemovedFromProject result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - if (input instanceof SListDataValue) { - return convertFromSObject((SListDataValue)input, session); - } - else if (input instanceof SSimpleDataValue) { - return convertFromSObject((SSimpleDataValue)input, session); - } - else if (input instanceof SReferenceDataValue) { - return convertFromSObject((SReferenceDataValue)input, session); - } - result.setFieldName(input.getFieldName()); + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); + result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); return result; } - public Set convertToSSetDataObject(Collection input) { - Set result = new HashSet(); - for (DataObject o : input) { + public Set convertToSSetProjectDeleted(Collection input) { + Set result = new HashSet(); + for (ProjectDeleted o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetDataObject(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SDataObject o : input) { + public Set convertFromSSetProjectDeleted(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SProjectDeleted o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListDataObject(Collection input) { - List result = new ArrayList(); - for (DataObject o : input) { + public List convertToSListProjectDeleted(Collection input) { + List result = new ArrayList(); + for (ProjectDeleted o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListDataObject(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SDataObject o : input) { + public List convertFromSListProjectDeleted(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SProjectDeleted o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SDataObject convertToSObject(DataObject input) { + public SProjectDeleted convertToSObject(ProjectDeleted input) { if (input == null) { return null; } - SDataObject result = new SDataObject(); + SProjectDeleted result = new SProjectDeleted(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setType(input.getType()); - result.setGuid(input.getGuid()); - result.setName(input.getName()); - List listvalues = new ArrayList(); - for (DataValue v : input.getValues()) { - listvalues.add(convertToSObject(v)); - } - result.setValues(listvalues); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + Project projectVal = input.getProject(); + result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); return result; } - public DataObject convertFromSObject(SDataObject input, DatabaseSession session) throws BimserverDatabaseException { + public ProjectDeleted convertFromSObject(SProjectDeleted input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - DataObject result = convertFromSObject(input, StoreFactory.eINSTANCE.createDataObject(), session); + ProjectDeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectDeleted(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -1969,83 +1525,77 @@ public DataObject convertFromSObject(SDataObject input, DatabaseSession session) return result; } - public DataObject convertFromSObject(SDataObject input) throws BimserverDatabaseException { - DataObject result = convertFromSObject(input, StoreFactory.eINSTANCE.createDataObject(), null); + public ProjectDeleted convertFromSObject(SProjectDeleted input) throws BimserverDatabaseException { + ProjectDeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectDeleted(), null); return result; } - public DataObject convertFromSObject(SDataObject input, DataObject result, DatabaseSession session) throws BimserverDatabaseException { + public ProjectDeleted convertFromSObject(SProjectDeleted input, ProjectDeleted result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setType(input.getType()); - result.setGuid(input.getGuid()); - result.setName(input.getName()); - List listvalues = result.getValues(); - for (SDataValue v : input.getValues()) { - listvalues.add(convertFromSObject(v, session)); - } + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); return result; } - public Set convertToSSetUserSession(Collection input) { - Set result = new HashSet(); - for (UserSession o : input) { + public Set convertToSSetUserDeleted(Collection input) { + Set result = new HashSet(); + for (UserDeleted o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetUserSession(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SUserSession o : input) { + public Set convertFromSSetUserDeleted(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SUserDeleted o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListUserSession(Collection input) { - List result = new ArrayList(); - for (UserSession o : input) { + public List convertToSListUserDeleted(Collection input) { + List result = new ArrayList(); + for (UserDeleted o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListUserSession(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SUserSession o : input) { + public List convertFromSListUserDeleted(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SUserDeleted o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SUserSession convertToSObject(UserSession input) { + public SUserDeleted convertToSObject(UserDeleted input) { if (input == null) { return null; } - SUserSession result = new SUserSession(); + SUserDeleted result = new SUserDeleted(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setUsername(input.getUsername()); - result.setName(input.getName()); - result.setType(SUserType.values()[input.getType().ordinal()]); - result.setRemoteAddress(input.getRemoteAddress()); - result.setActiveSince(input.getActiveSince()); - result.setLastActive(input.getLastActive()); + result.setDate(input.getDate()); result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); User userVal = input.getUser(); result.setUserId(userVal == null ? -1 : userVal.getOid()); return result; } - public UserSession convertFromSObject(SUserSession input, DatabaseSession session) throws BimserverDatabaseException { + public UserDeleted convertFromSObject(SUserDeleted input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - UserSession result = convertFromSObject(input, StoreFactory.eINSTANCE.createUserSession(), session); + UserDeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createUserDeleted(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -2053,78 +1603,77 @@ public UserSession convertFromSObject(SUserSession input, DatabaseSession sessio return result; } - public UserSession convertFromSObject(SUserSession input) throws BimserverDatabaseException { - UserSession result = convertFromSObject(input, StoreFactory.eINSTANCE.createUserSession(), null); + public UserDeleted convertFromSObject(SUserDeleted input) throws BimserverDatabaseException { + UserDeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createUserDeleted(), null); return result; } - public UserSession convertFromSObject(SUserSession input, UserSession result, DatabaseSession session) throws BimserverDatabaseException { + public UserDeleted convertFromSObject(SUserDeleted input, UserDeleted result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setUsername(input.getUsername()); - result.setName(input.getName()); - result.setType(UserType.values()[input.getType().ordinal()]); - result.setRemoteAddress(input.getRemoteAddress()); - result.setActiveSince(input.getActiveSince()); - result.setLastActive(input.getLastActive()); + result.setDate(input.getDate()); result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); return result; } - public Set convertToSSetMigration(Collection input) { - Set result = new HashSet(); - for (Migration o : input) { + public Set convertToSSetPasswordReset(Collection input) { + Set result = new HashSet(); + for (PasswordReset o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetMigration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SMigration o : input) { - result.add(convertFromSObject(o, session)); + public Set convertFromSSetPasswordReset(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SPasswordReset o : input) { + result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListMigration(Collection input) { - List result = new ArrayList(); - for (Migration o : input) { + public List convertToSListPasswordReset(Collection input) { + List result = new ArrayList(); + for (PasswordReset o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListMigration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SMigration o : input) { + public List convertFromSListPasswordReset(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SPasswordReset o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SMigration convertToSObject(Migration input) { + public SPasswordReset convertToSObject(PasswordReset input) { if (input == null) { return null; } - SMigration result = new SMigration(); + SPasswordReset result = new SPasswordReset(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setNumber(input.getNumber()); - result.setDescription(input.getDescription()); - result.setExecuted(input.getExecuted()); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + User userVal = input.getUser(); + result.setUserId(userVal == null ? -1 : userVal.getOid()); return result; } - public Migration convertFromSObject(SMigration input, DatabaseSession session) throws BimserverDatabaseException { + public PasswordReset convertFromSObject(SPasswordReset input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - Migration result = convertFromSObject(input, StoreFactory.eINSTANCE.createMigration(), session); + PasswordReset result = convertFromSObject(input, LogFactory.eINSTANCE.createPasswordReset(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -2132,73 +1681,77 @@ public Migration convertFromSObject(SMigration input, DatabaseSession session) t return result; } - public Migration convertFromSObject(SMigration input) throws BimserverDatabaseException { - Migration result = convertFromSObject(input, StoreFactory.eINSTANCE.createMigration(), null); + public PasswordReset convertFromSObject(SPasswordReset input) throws BimserverDatabaseException { + PasswordReset result = convertFromSObject(input, LogFactory.eINSTANCE.createPasswordReset(), null); return result; } - public Migration convertFromSObject(SMigration input, Migration result, DatabaseSession session) throws BimserverDatabaseException { + public PasswordReset convertFromSObject(SPasswordReset input, PasswordReset result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setNumber(input.getNumber()); - result.setDescription(input.getDescription()); - result.setExecuted(input.getExecuted()); + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); return result; } - public Set convertToSSetReferenceDataValue(Collection input) { - Set result = new HashSet(); - for (ReferenceDataValue o : input) { + public Set convertToSSetDatabaseCreated(Collection input) { + Set result = new HashSet(); + for (DatabaseCreated o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetReferenceDataValue(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SReferenceDataValue o : input) { + public Set convertFromSSetDatabaseCreated(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SDatabaseCreated o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListReferenceDataValue(Collection input) { - List result = new ArrayList(); - for (ReferenceDataValue o : input) { + public List convertToSListDatabaseCreated(Collection input) { + List result = new ArrayList(); + for (DatabaseCreated o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListReferenceDataValue(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SReferenceDataValue o : input) { + public List convertFromSListDatabaseCreated(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SDatabaseCreated o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SReferenceDataValue convertToSObject(ReferenceDataValue input) { + public SDatabaseCreated convertToSObject(DatabaseCreated input) { if (input == null) { return null; } - SReferenceDataValue result = new SReferenceDataValue(); + SDatabaseCreated result = new SDatabaseCreated(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setFieldName(input.getFieldName()); - result.setTypeName(input.getTypeName()); - result.setGuid(input.getGuid()); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setPath(input.getPath()); + result.setVersion(input.getVersion()); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); return result; } - public ReferenceDataValue convertFromSObject(SReferenceDataValue input, DatabaseSession session) throws BimserverDatabaseException { + public DatabaseCreated convertFromSObject(SDatabaseCreated input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ReferenceDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createReferenceDataValue(), session); + DatabaseCreated result = convertFromSObject(input, LogFactory.eINSTANCE.createDatabaseCreated(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -2206,76 +1759,76 @@ public ReferenceDataValue convertFromSObject(SReferenceDataValue input, Database return result; } - public ReferenceDataValue convertFromSObject(SReferenceDataValue input) throws BimserverDatabaseException { - ReferenceDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createReferenceDataValue(), null); + public DatabaseCreated convertFromSObject(SDatabaseCreated input) throws BimserverDatabaseException { + DatabaseCreated result = convertFromSObject(input, LogFactory.eINSTANCE.createDatabaseCreated(), null); return result; } - public ReferenceDataValue convertFromSObject(SReferenceDataValue input, ReferenceDataValue result, DatabaseSession session) throws BimserverDatabaseException { + public DatabaseCreated convertFromSObject(SDatabaseCreated input, DatabaseCreated result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setFieldName(input.getFieldName()); - result.setTypeName(input.getTypeName()); - result.setGuid(input.getGuid()); + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setPath(input.getPath()); + result.setVersion(input.getVersion()); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); return result; } - public Set convertToSSetListDataValue(Collection input) { - Set result = new HashSet(); - for (ListDataValue o : input) { + public Set convertToSSetServerStarted(Collection input) { + Set result = new HashSet(); + for (ServerStarted o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetListDataValue(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SListDataValue o : input) { + public Set convertFromSSetServerStarted(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SServerStarted o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListListDataValue(Collection input) { - List result = new ArrayList(); - for (ListDataValue o : input) { + public List convertToSListServerStarted(Collection input) { + List result = new ArrayList(); + for (ServerStarted o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListListDataValue(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SListDataValue o : input) { + public List convertFromSListServerStarted(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SServerStarted o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SListDataValue convertToSObject(ListDataValue input) { + public SServerStarted convertToSObject(ServerStarted input) { if (input == null) { return null; } - SListDataValue result = new SListDataValue(); + SServerStarted result = new SServerStarted(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setFieldName(input.getFieldName()); - List listvalues = new ArrayList(); - for (DataValue v : input.getValues()) { - listvalues.add(convertToSObject(v)); - } - result.setValues(listvalues); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); return result; } - public ListDataValue convertFromSObject(SListDataValue input, DatabaseSession session) throws BimserverDatabaseException { + public ServerStarted convertFromSObject(SServerStarted input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ListDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createListDataValue(), session); + ServerStarted result = convertFromSObject(input, LogFactory.eINSTANCE.createServerStarted(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -2283,74 +1836,76 @@ public ListDataValue convertFromSObject(SListDataValue input, DatabaseSession se return result; } - public ListDataValue convertFromSObject(SListDataValue input) throws BimserverDatabaseException { - ListDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createListDataValue(), null); + public ServerStarted convertFromSObject(SServerStarted input) throws BimserverDatabaseException { + ServerStarted result = convertFromSObject(input, LogFactory.eINSTANCE.createServerStarted(), null); return result; } - public ListDataValue convertFromSObject(SListDataValue input, ListDataValue result, DatabaseSession session) throws BimserverDatabaseException { + public ServerStarted convertFromSObject(SServerStarted input, ServerStarted result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setFieldName(input.getFieldName()); - List listvalues = result.getValues(); - for (SDataValue v : input.getValues()) { - listvalues.add(convertFromSObject(v, session)); - } + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); return result; } - public Set convertToSSetSimpleDataValue(Collection input) { - Set result = new HashSet(); - for (SimpleDataValue o : input) { + public Set convertToSSetProjectUpdated(Collection input) { + Set result = new HashSet(); + for (ProjectUpdated o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetSimpleDataValue(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SSimpleDataValue o : input) { + public Set convertFromSSetProjectUpdated(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SProjectUpdated o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListSimpleDataValue(Collection input) { - List result = new ArrayList(); - for (SimpleDataValue o : input) { + public List convertToSListProjectUpdated(Collection input) { + List result = new ArrayList(); + for (ProjectUpdated o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListSimpleDataValue(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SSimpleDataValue o : input) { + public List convertFromSListProjectUpdated(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SProjectUpdated o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SSimpleDataValue convertToSObject(SimpleDataValue input) { + public SProjectUpdated convertToSObject(ProjectUpdated input) { if (input == null) { return null; } - SSimpleDataValue result = new SSimpleDataValue(); + SProjectUpdated result = new SProjectUpdated(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setFieldName(input.getFieldName()); - result.setStringValue(input.getStringValue()); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + Project projectVal = input.getProject(); + result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); return result; } - public SimpleDataValue convertFromSObject(SSimpleDataValue input, DatabaseSession session) throws BimserverDatabaseException { + public ProjectUpdated convertFromSObject(SProjectUpdated input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - SimpleDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createSimpleDataValue(), session); + ProjectUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectUpdated(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -2358,71 +1913,77 @@ public SimpleDataValue convertFromSObject(SSimpleDataValue input, DatabaseSessio return result; } - public SimpleDataValue convertFromSObject(SSimpleDataValue input) throws BimserverDatabaseException { - SimpleDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createSimpleDataValue(), null); + public ProjectUpdated convertFromSObject(SProjectUpdated input) throws BimserverDatabaseException { + ProjectUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectUpdated(), null); return result; } - public SimpleDataValue convertFromSObject(SSimpleDataValue input, SimpleDataValue result, DatabaseSession session) throws BimserverDatabaseException { + public ProjectUpdated convertFromSObject(SProjectUpdated input, ProjectUpdated result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setFieldName(input.getFieldName()); - result.setStringValue(input.getStringValue()); + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); return result; } - public Set convertToSSetDatabaseInformationItem(Collection input) { - Set result = new HashSet(); - for (DatabaseInformationItem o : input) { + public Set convertToSSetUserUndeleted(Collection input) { + Set result = new HashSet(); + for (UserUndeleted o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetDatabaseInformationItem(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SDatabaseInformationItem o : input) { + public Set convertFromSSetUserUndeleted(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SUserUndeleted o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListDatabaseInformationItem(Collection input) { - List result = new ArrayList(); - for (DatabaseInformationItem o : input) { + public List convertToSListUserUndeleted(Collection input) { + List result = new ArrayList(); + for (UserUndeleted o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListDatabaseInformationItem(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SDatabaseInformationItem o : input) { + public List convertFromSListUserUndeleted(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SUserUndeleted o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SDatabaseInformationItem convertToSObject(DatabaseInformationItem input) { + public SUserUndeleted convertToSObject(UserUndeleted input) { if (input == null) { return null; } - SDatabaseInformationItem result = new SDatabaseInformationItem(); + SUserUndeleted result = new SUserUndeleted(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setKey(input.getKey()); - result.setValue(input.getValue()); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + User userVal = input.getUser(); + result.setUserId(userVal == null ? -1 : userVal.getOid()); return result; } - public DatabaseInformationItem convertFromSObject(SDatabaseInformationItem input, DatabaseSession session) throws BimserverDatabaseException { + public UserUndeleted convertFromSObject(SUserUndeleted input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - DatabaseInformationItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformationItem(), session); + UserUndeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createUserUndeleted(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -2430,75 +1991,77 @@ public DatabaseInformationItem convertFromSObject(SDatabaseInformationItem input return result; } - public DatabaseInformationItem convertFromSObject(SDatabaseInformationItem input) throws BimserverDatabaseException { - DatabaseInformationItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformationItem(), null); + public UserUndeleted convertFromSObject(SUserUndeleted input) throws BimserverDatabaseException { + UserUndeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createUserUndeleted(), null); return result; } - public DatabaseInformationItem convertFromSObject(SDatabaseInformationItem input, DatabaseInformationItem result, DatabaseSession session) throws BimserverDatabaseException { + public UserUndeleted convertFromSObject(SUserUndeleted input, UserUndeleted result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setKey(input.getKey()); - result.setValue(input.getValue()); + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); return result; } - public Set convertToSSetDatabaseInformationCategory(Collection input) { - Set result = new HashSet(); - for (DatabaseInformationCategory o : input) { + public Set convertToSSetProjectUndeleted(Collection input) { + Set result = new HashSet(); + for (ProjectUndeleted o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetDatabaseInformationCategory(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SDatabaseInformationCategory o : input) { + public Set convertFromSSetProjectUndeleted(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SProjectUndeleted o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListDatabaseInformationCategory(Collection input) { - List result = new ArrayList(); - for (DatabaseInformationCategory o : input) { + public List convertToSListProjectUndeleted(Collection input) { + List result = new ArrayList(); + for (ProjectUndeleted o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListDatabaseInformationCategory(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SDatabaseInformationCategory o : input) { + public List convertFromSListProjectUndeleted(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SProjectUndeleted o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SDatabaseInformationCategory convertToSObject(DatabaseInformationCategory input) { + public SProjectUndeleted convertToSObject(ProjectUndeleted input) { if (input == null) { return null; } - SDatabaseInformationCategory result = new SDatabaseInformationCategory(); + SProjectUndeleted result = new SProjectUndeleted(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setTitle(input.getTitle()); - List listitems = new ArrayList(); - for (DatabaseInformationItem v : input.getItems()) { - listitems.add(convertToSObject(v)); - } - result.setItems(listitems); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + Project projectVal = input.getProject(); + result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); return result; } - public DatabaseInformationCategory convertFromSObject(SDatabaseInformationCategory input, DatabaseSession session) throws BimserverDatabaseException { + public ProjectUndeleted convertFromSObject(SProjectUndeleted input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - DatabaseInformationCategory result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformationCategory(), session); + ProjectUndeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectUndeleted(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -2506,86 +2069,77 @@ public DatabaseInformationCategory convertFromSObject(SDatabaseInformationCatego return result; } - public DatabaseInformationCategory convertFromSObject(SDatabaseInformationCategory input) throws BimserverDatabaseException { - DatabaseInformationCategory result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformationCategory(), null); + public ProjectUndeleted convertFromSObject(SProjectUndeleted input) throws BimserverDatabaseException { + ProjectUndeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectUndeleted(), null); return result; } - public DatabaseInformationCategory convertFromSObject(SDatabaseInformationCategory input, DatabaseInformationCategory result, DatabaseSession session) throws BimserverDatabaseException { + public ProjectUndeleted convertFromSObject(SProjectUndeleted input, ProjectUndeleted result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setTitle(input.getTitle()); - List listitems = result.getItems(); - for (SDatabaseInformationItem v : input.getItems()) { - listitems.add(convertFromSObject(v, session)); - } + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); return result; } - public Set convertToSSetDatabaseInformation(Collection input) { - Set result = new HashSet(); - for (DatabaseInformation o : input) { + public Set convertToSSetRevisionUpdated(Collection input) { + Set result = new HashSet(); + for (RevisionUpdated o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetDatabaseInformation(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SDatabaseInformation o : input) { + public Set convertFromSSetRevisionUpdated(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SRevisionUpdated o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListDatabaseInformation(Collection input) { - List result = new ArrayList(); - for (DatabaseInformation o : input) { + public List convertToSListRevisionUpdated(Collection input) { + List result = new ArrayList(); + for (RevisionUpdated o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListDatabaseInformation(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SDatabaseInformation o : input) { + public List convertFromSListRevisionUpdated(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SRevisionUpdated o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SDatabaseInformation convertToSObject(DatabaseInformation input) { + public SRevisionUpdated convertToSObject(RevisionUpdated input) { if (input == null) { return null; } - SDatabaseInformation result = new SDatabaseInformation(); + SRevisionUpdated result = new SRevisionUpdated(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setNumberOfProjects(input.getNumberOfProjects()); - result.setNumberOfUsers(input.getNumberOfUsers()); - result.setNumberOfRevisions(input.getNumberOfRevisions()); - result.setNumberOfCheckouts(input.getNumberOfCheckouts()); - result.setDatabaseSizeInBytes(input.getDatabaseSizeInBytes()); - result.setType(input.getType()); - result.setCreated(input.getCreated()); - result.setLocation(input.getLocation()); - result.setSchemaVersion(input.getSchemaVersion()); - List listcategories = new ArrayList(); - for (DatabaseInformationCategory v : input.getCategories()) { - listcategories.add(convertToSObject(v)); - } - result.setCategories(listcategories); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + Revision revisionVal = input.getRevision(); + result.setRevisionId(revisionVal == null ? -1 : revisionVal.getOid()); return result; } - public DatabaseInformation convertFromSObject(SDatabaseInformation input, DatabaseSession session) throws BimserverDatabaseException { + public RevisionUpdated convertFromSObject(SRevisionUpdated input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - DatabaseInformation result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformation(), session); + RevisionUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionUpdated(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -2593,95 +2147,77 @@ public DatabaseInformation convertFromSObject(SDatabaseInformation input, Databa return result; } - public DatabaseInformation convertFromSObject(SDatabaseInformation input) throws BimserverDatabaseException { - DatabaseInformation result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformation(), null); + public RevisionUpdated convertFromSObject(SRevisionUpdated input) throws BimserverDatabaseException { + RevisionUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionUpdated(), null); return result; } - public DatabaseInformation convertFromSObject(SDatabaseInformation input, DatabaseInformation result, DatabaseSession session) throws BimserverDatabaseException { + public RevisionUpdated convertFromSObject(SRevisionUpdated input, RevisionUpdated result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setNumberOfProjects(input.getNumberOfProjects()); - result.setNumberOfUsers(input.getNumberOfUsers()); - result.setNumberOfRevisions(input.getNumberOfRevisions()); - result.setNumberOfCheckouts(input.getNumberOfCheckouts()); - result.setDatabaseSizeInBytes(input.getDatabaseSizeInBytes()); - result.setType(input.getType()); - result.setCreated(input.getCreated()); - result.setLocation(input.getLocation()); - result.setSchemaVersion(input.getSchemaVersion()); - List listcategories = result.getCategories(); - for (SDatabaseInformationCategory v : input.getCategories()) { - listcategories.add(convertFromSObject(v, session)); - } + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getRevisionId(), OldQuery.getDefault())); return result; } - public Set convertToSSetPluginDescriptor(Collection input) { - Set result = new HashSet(); - for (PluginDescriptor o : input) { + public Set convertToSSetGeoTagUpdated(Collection input) { + Set result = new HashSet(); + for (GeoTagUpdated o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetPluginDescriptor(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SPluginDescriptor o : input) { + public Set convertFromSSetGeoTagUpdated(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SGeoTagUpdated o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListPluginDescriptor(Collection input) { - List result = new ArrayList(); - for (PluginDescriptor o : input) { + public List convertToSListGeoTagUpdated(Collection input) { + List result = new ArrayList(); + for (GeoTagUpdated o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListPluginDescriptor(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SPluginDescriptor o : input) { + public List convertFromSListGeoTagUpdated(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SGeoTagUpdated o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SPluginDescriptor convertToSObject(PluginDescriptor input) { + public SGeoTagUpdated convertToSObject(GeoTagUpdated input) { if (input == null) { return null; } - SPluginDescriptor result = new SPluginDescriptor(); + SGeoTagUpdated result = new SGeoTagUpdated(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setName(input.getName()); - result.setPluginClassName(input.getPluginClassName()); - result.setDescription(input.getDescription()); - result.setLocation(input.getLocation()); - result.setEnabled(input.getEnabled()); - result.setPluginInterfaceClassName(input.getPluginInterfaceClassName()); - result.setIdentifier(input.getIdentifier()); - result.setInstallForNewUsers(input.isInstallForNewUsers()); - List listconfigurations = new ArrayList(); - for (PluginConfiguration v : input.getConfigurations()) { - listconfigurations.add(v.getOid()); - } - result.setConfigurations(listconfigurations); - PluginBundleVersion pluginBundleVersionVal = input.getPluginBundleVersion(); - result.setPluginBundleVersionId(pluginBundleVersionVal == null ? -1 : pluginBundleVersionVal.getOid()); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + GeoTag geoTagVal = input.getGeoTag(); + result.setGeoTagId(geoTagVal == null ? -1 : geoTagVal.getOid()); return result; } - public PluginDescriptor convertFromSObject(SPluginDescriptor input, DatabaseSession session) throws BimserverDatabaseException { + public GeoTagUpdated convertFromSObject(SGeoTagUpdated input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - PluginDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginDescriptor(), session); + GeoTagUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createGeoTagUpdated(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -2689,83 +2225,77 @@ public PluginDescriptor convertFromSObject(SPluginDescriptor input, DatabaseSess return result; } - public PluginDescriptor convertFromSObject(SPluginDescriptor input) throws BimserverDatabaseException { - PluginDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginDescriptor(), null); + public GeoTagUpdated convertFromSObject(SGeoTagUpdated input) throws BimserverDatabaseException { + GeoTagUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createGeoTagUpdated(), null); return result; } - public PluginDescriptor convertFromSObject(SPluginDescriptor input, PluginDescriptor result, DatabaseSession session) throws BimserverDatabaseException { + public GeoTagUpdated convertFromSObject(SGeoTagUpdated input, GeoTagUpdated result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setName(input.getName()); - result.setPluginClassName(input.getPluginClassName()); - result.setDescription(input.getDescription()); - result.setLocation(input.getLocation()); - result.setEnabled(input.getEnabled()); - result.setPluginInterfaceClassName(input.getPluginInterfaceClassName()); - result.setIdentifier(input.getIdentifier()); - result.setInstallForNewUsers(input.isInstallForNewUsers()); - List listconfigurations = result.getConfigurations(); - for (long oid : input.getConfigurations()) { - listconfigurations.add((PluginConfiguration)session.get(StorePackage.eINSTANCE.getPluginConfiguration(), oid, OldQuery.getDefault())); - } - result.setPluginBundleVersion((PluginBundleVersion)session.get(StorePackage.eINSTANCE.getPluginBundleVersion(), input.getPluginBundleVersionId(), OldQuery.getDefault())); + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setGeoTag((GeoTag)session.get(StorePackage.eINSTANCE.getGeoTag(), input.getGeoTagId(), OldQuery.getDefault())); return result; } - public Set convertToSSetRevisionSummaryType(Collection input) { - Set result = new HashSet(); - for (RevisionSummaryType o : input) { + public Set convertToSSetPasswordChanged(Collection input) { + Set result = new HashSet(); + for (PasswordChanged o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetRevisionSummaryType(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SRevisionSummaryType o : input) { + public Set convertFromSSetPasswordChanged(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SPasswordChanged o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListRevisionSummaryType(Collection input) { - List result = new ArrayList(); - for (RevisionSummaryType o : input) { + public List convertToSListPasswordChanged(Collection input) { + List result = new ArrayList(); + for (PasswordChanged o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListRevisionSummaryType(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SRevisionSummaryType o : input) { + public List convertFromSListPasswordChanged(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SPasswordChanged o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SRevisionSummaryType convertToSObject(RevisionSummaryType input) { + public SPasswordChanged convertToSObject(PasswordChanged input) { if (input == null) { return null; } - SRevisionSummaryType result = new SRevisionSummaryType(); + SPasswordChanged result = new SPasswordChanged(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setName(input.getName()); - result.setCount(input.getCount()); - result.setSchema(input.getSchema()); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + User userVal = input.getUser(); + result.setUserId(userVal == null ? -1 : userVal.getOid()); return result; } - public RevisionSummaryType convertFromSObject(SRevisionSummaryType input, DatabaseSession session) throws BimserverDatabaseException { + public PasswordChanged convertFromSObject(SPasswordChanged input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - RevisionSummaryType result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummaryType(), session); + PasswordChanged result = convertFromSObject(input, LogFactory.eINSTANCE.createPasswordChanged(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -2773,76 +2303,77 @@ public RevisionSummaryType convertFromSObject(SRevisionSummaryType input, Databa return result; } - public RevisionSummaryType convertFromSObject(SRevisionSummaryType input) throws BimserverDatabaseException { - RevisionSummaryType result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummaryType(), null); + public PasswordChanged convertFromSObject(SPasswordChanged input) throws BimserverDatabaseException { + PasswordChanged result = convertFromSObject(input, LogFactory.eINSTANCE.createPasswordChanged(), null); return result; } - public RevisionSummaryType convertFromSObject(SRevisionSummaryType input, RevisionSummaryType result, DatabaseSession session) throws BimserverDatabaseException { + public PasswordChanged convertFromSObject(SPasswordChanged input, PasswordChanged result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setName(input.getName()); - result.setCount(input.getCount()); - result.setSchema(input.getSchema()); + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); return result; } - public Set convertToSSetRevisionSummaryContainer(Collection input) { - Set result = new HashSet(); - for (RevisionSummaryContainer o : input) { + public Set convertToSSetUserChanged(Collection input) { + Set result = new HashSet(); + for (UserChanged o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetRevisionSummaryContainer(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SRevisionSummaryContainer o : input) { + public Set convertFromSSetUserChanged(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SUserChanged o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListRevisionSummaryContainer(Collection input) { - List result = new ArrayList(); - for (RevisionSummaryContainer o : input) { + public List convertToSListUserChanged(Collection input) { + List result = new ArrayList(); + for (UserChanged o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListRevisionSummaryContainer(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SRevisionSummaryContainer o : input) { + public List convertFromSListUserChanged(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SUserChanged o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SRevisionSummaryContainer convertToSObject(RevisionSummaryContainer input) { + public SUserChanged convertToSObject(UserChanged input) { if (input == null) { return null; } - SRevisionSummaryContainer result = new SRevisionSummaryContainer(); + SUserChanged result = new SUserChanged(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setName(input.getName()); - List listtypes = new ArrayList(); - for (RevisionSummaryType v : input.getTypes()) { - listtypes.add(convertToSObject(v)); - } - result.setTypes(listtypes); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + User userVal = input.getUser(); + result.setUserId(userVal == null ? -1 : userVal.getOid()); return result; } - public RevisionSummaryContainer convertFromSObject(SRevisionSummaryContainer input, DatabaseSession session) throws BimserverDatabaseException { + public UserChanged convertFromSObject(SUserChanged input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - RevisionSummaryContainer result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummaryContainer(), session); + UserChanged result = convertFromSObject(input, LogFactory.eINSTANCE.createUserChanged(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -2850,77 +2381,79 @@ public RevisionSummaryContainer convertFromSObject(SRevisionSummaryContainer inp return result; } - public RevisionSummaryContainer convertFromSObject(SRevisionSummaryContainer input) throws BimserverDatabaseException { - RevisionSummaryContainer result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummaryContainer(), null); + public UserChanged convertFromSObject(SUserChanged input) throws BimserverDatabaseException { + UserChanged result = convertFromSObject(input, LogFactory.eINSTANCE.createUserChanged(), null); return result; } - public RevisionSummaryContainer convertFromSObject(SRevisionSummaryContainer input, RevisionSummaryContainer result, DatabaseSession session) throws BimserverDatabaseException { + public UserChanged convertFromSObject(SUserChanged input, UserChanged result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setName(input.getName()); - List listtypes = result.getTypes(); - for (SRevisionSummaryType v : input.getTypes()) { - listtypes.add(convertFromSObject(v, session)); - } + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); return result; } - public Set convertToSSetRevisionSummary(Collection input) { - Set result = new HashSet(); - for (RevisionSummary o : input) { + public Set convertToSSetExtendedDataAddedToRevision(Collection input) { + Set result = new HashSet(); + for (ExtendedDataAddedToRevision o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetRevisionSummary(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SRevisionSummary o : input) { + public Set convertFromSSetExtendedDataAddedToRevision(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SExtendedDataAddedToRevision o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListRevisionSummary(Collection input) { - List result = new ArrayList(); - for (RevisionSummary o : input) { + public List convertToSListExtendedDataAddedToRevision(Collection input) { + List result = new ArrayList(); + for (ExtendedDataAddedToRevision o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListRevisionSummary(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SRevisionSummary o : input) { + public List convertFromSListExtendedDataAddedToRevision(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SExtendedDataAddedToRevision o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SRevisionSummary convertToSObject(RevisionSummary input) { + public SExtendedDataAddedToRevision convertToSObject(ExtendedDataAddedToRevision input) { if (input == null) { return null; } - SRevisionSummary result = new SRevisionSummary(); + SExtendedDataAddedToRevision result = new SExtendedDataAddedToRevision(); result.setOid(input.getOid()); result.setRid(input.getRid()); - List listlist = new ArrayList(); - for (RevisionSummaryContainer v : input.getList()) { - listlist.add(convertToSObject(v)); - } - result.setList(listlist); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + Revision revisionVal = input.getRevision(); + result.setRevisionId(revisionVal == null ? -1 : revisionVal.getOid()); + ExtendedData extendedDataVal = input.getExtendedData(); + result.setExtendedDataId(extendedDataVal == null ? -1 : extendedDataVal.getOid()); return result; } - public RevisionSummary convertFromSObject(SRevisionSummary input, DatabaseSession session) throws BimserverDatabaseException { + public ExtendedDataAddedToRevision convertFromSObject(SExtendedDataAddedToRevision input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - RevisionSummary result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummary(), session); + ExtendedDataAddedToRevision result = convertFromSObject(input, LogFactory.eINSTANCE.createExtendedDataAddedToRevision(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -2928,77 +2461,80 @@ public RevisionSummary convertFromSObject(SRevisionSummary input, DatabaseSessio return result; } - public RevisionSummary convertFromSObject(SRevisionSummary input) throws BimserverDatabaseException { - RevisionSummary result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummary(), null); + public ExtendedDataAddedToRevision convertFromSObject(SExtendedDataAddedToRevision input) throws BimserverDatabaseException { + ExtendedDataAddedToRevision result = convertFromSObject(input, LogFactory.eINSTANCE.createExtendedDataAddedToRevision(), null); return result; } - public RevisionSummary convertFromSObject(SRevisionSummary input, RevisionSummary result, DatabaseSession session) throws BimserverDatabaseException { + public ExtendedDataAddedToRevision convertFromSObject(SExtendedDataAddedToRevision input, ExtendedDataAddedToRevision result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - List listlist = result.getList(); - for (SRevisionSummaryContainer v : input.getList()) { - listlist.add(convertFromSObject(v, session)); - } + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getRevisionId(), OldQuery.getDefault())); + result.setExtendedData((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), input.getExtendedDataId(), OldQuery.getDefault())); return result; } - public Set convertToSSetLongAction(Collection input) { - Set result = new HashSet(); - for (LongAction o : input) { + public Set convertToSSetExtendedDataAddedToProject(Collection input) { + Set result = new HashSet(); + for (ExtendedDataAddedToProject o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetLongAction(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SLongAction o : input) { + public Set convertFromSSetExtendedDataAddedToProject(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SExtendedDataAddedToProject o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListLongAction(Collection input) { - List result = new ArrayList(); - for (LongAction o : input) { + public List convertToSListExtendedDataAddedToProject(Collection input) { + List result = new ArrayList(); + for (ExtendedDataAddedToProject o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListLongAction(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SLongAction o : input) { + public List convertFromSListExtendedDataAddedToProject(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SExtendedDataAddedToProject o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SLongAction convertToSObject(LongAction input) { + public SExtendedDataAddedToProject convertToSObject(ExtendedDataAddedToProject input) { if (input == null) { return null; } - SLongAction result = new SLongAction(); + SExtendedDataAddedToProject result = new SExtendedDataAddedToProject(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setIdentification(input.getIdentification()); - result.setStart(input.getStart()); - result.setUsername(input.getUsername()); - result.setName(input.getName()); - User userVal = input.getUser(); - result.setUserId(userVal == null ? -1 : userVal.getOid()); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + Project projectVal = input.getProject(); + result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); + ExtendedData extendedDataVal = input.getExtendedData(); + result.setExtendedDataId(extendedDataVal == null ? -1 : extendedDataVal.getOid()); return result; } - public LongAction convertFromSObject(SLongAction input, DatabaseSession session) throws BimserverDatabaseException { + public ExtendedDataAddedToProject convertFromSObject(SExtendedDataAddedToProject input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - LongAction result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongAction(), session); + ExtendedDataAddedToProject result = convertFromSObject(input, LogFactory.eINSTANCE.createExtendedDataAddedToProject(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -3006,73 +2542,83 @@ public LongAction convertFromSObject(SLongAction input, DatabaseSession session) return result; } - public LongAction convertFromSObject(SLongAction input) throws BimserverDatabaseException { - LongAction result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongAction(), null); + public ExtendedDataAddedToProject convertFromSObject(SExtendedDataAddedToProject input) throws BimserverDatabaseException { + ExtendedDataAddedToProject result = convertFromSObject(input, LogFactory.eINSTANCE.createExtendedDataAddedToProject(), null); return result; } - public LongAction convertFromSObject(SLongAction input, LongAction result, DatabaseSession session) throws BimserverDatabaseException { + public ExtendedDataAddedToProject convertFromSObject(SExtendedDataAddedToProject input, ExtendedDataAddedToProject result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setIdentification(input.getIdentification()); - result.setStart(input.getStart()); - result.setUsername(input.getUsername()); - result.setName(input.getName()); - result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); + result.setExtendedData((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), input.getExtendedDataId(), OldQuery.getDefault())); return result; } - public Set convertToSSetObjectIDMPluginDescriptor(Collection input) { - Set result = new HashSet(); - for (ObjectIDMPluginDescriptor o : input) { + public Set convertToSSetRemoteServiceCalled(Collection input) { + Set result = new HashSet(); + for (RemoteServiceCalled o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetObjectIDMPluginDescriptor(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SObjectIDMPluginDescriptor o : input) { + public Set convertFromSSetRemoteServiceCalled(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SRemoteServiceCalled o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListObjectIDMPluginDescriptor(Collection input) { - List result = new ArrayList(); - for (ObjectIDMPluginDescriptor o : input) { + public List convertToSListRemoteServiceCalled(Collection input) { + List result = new ArrayList(); + for (RemoteServiceCalled o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListObjectIDMPluginDescriptor(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SObjectIDMPluginDescriptor o : input) { + public List convertFromSListRemoteServiceCalled(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SRemoteServiceCalled o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SObjectIDMPluginDescriptor convertToSObject(ObjectIDMPluginDescriptor input) { + public SRemoteServiceCalled convertToSObject(RemoteServiceCalled input) { if (input == null) { return null; } - SObjectIDMPluginDescriptor result = new SObjectIDMPluginDescriptor(); + SRemoteServiceCalled result = new SRemoteServiceCalled(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setClassName(input.getClassName()); + result.setDate(input.getDate()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setState(SNotifictionResultEnum.values()[input.getState().ordinal()]); + result.setPercentage(input.getPercentage()); + result.getInfos().addAll(input.getInfos()); + result.getWarnings().addAll(input.getWarnings()); + result.getErrors().addAll(input.getErrors()); + User executorVal = input.getExecutor(); + result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + Service serviceVal = input.getService(); + result.setServiceId(serviceVal == null ? -1 : serviceVal.getOid()); return result; } - public ObjectIDMPluginDescriptor convertFromSObject(SObjectIDMPluginDescriptor input, DatabaseSession session) throws BimserverDatabaseException { + public RemoteServiceCalled convertFromSObject(SRemoteServiceCalled input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ObjectIDMPluginDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectIDMPluginDescriptor(), session); + RemoteServiceCalled result = convertFromSObject(input, LogFactory.eINSTANCE.createRemoteServiceCalled(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -3080,86 +2626,95 @@ public ObjectIDMPluginDescriptor convertFromSObject(SObjectIDMPluginDescriptor i return result; } - public ObjectIDMPluginDescriptor convertFromSObject(SObjectIDMPluginDescriptor input) throws BimserverDatabaseException { - ObjectIDMPluginDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectIDMPluginDescriptor(), null); + public RemoteServiceCalled convertFromSObject(SRemoteServiceCalled input) throws BimserverDatabaseException { + RemoteServiceCalled result = convertFromSObject(input, LogFactory.eINSTANCE.createRemoteServiceCalled(), null); return result; } - public ObjectIDMPluginDescriptor convertFromSObject(SObjectIDMPluginDescriptor input, ObjectIDMPluginDescriptor result, DatabaseSession session) throws BimserverDatabaseException { + public RemoteServiceCalled convertFromSObject(SRemoteServiceCalled input, RemoteServiceCalled result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setClassName(input.getClassName()); + result.setDate(input.getDate()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setState(NotifictionResultEnum.values()[input.getState().ordinal()]); + result.setPercentage(input.getPercentage()); + result.getInfos().addAll(input.getInfos()); + result.getWarnings().addAll(input.getWarnings()); + result.getErrors().addAll(input.getErrors()); + result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setService((Service)session.get(StorePackage.eINSTANCE.getService(), input.getServiceId(), OldQuery.getDefault())); return result; } - public SCompareType convertToSObject(CompareType input) { - return SCompareType.values()[input.ordinal()]; - } - - public CompareType convertFromSObject(SCompareType input) { - return CompareType.values()[input.ordinal()]; - } - public Set convertToSSetCompareItem(Collection input) { - Set result = new HashSet(); - for (CompareItem o : input) { + public Set convertToSSetGeometryInfo(Collection input) { + Set result = new HashSet(); + for (GeometryInfo o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetCompareItem(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SCompareItem o : input) { + public Set convertFromSSetGeometryInfo(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SGeometryInfo o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListCompareItem(Collection input) { - List result = new ArrayList(); - for (CompareItem o : input) { + public List convertToSListGeometryInfo(Collection input) { + List result = new ArrayList(); + for (GeometryInfo o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListCompareItem(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SCompareItem o : input) { + public List convertFromSListGeometryInfo(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SGeometryInfo o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SCompareItem convertToSObject(CompareItem input) { + public SGeometryInfo convertToSObject(GeometryInfo input) { if (input == null) { return null; } - if (input instanceof ObjectModified) { - return convertToSObject((ObjectModified)input); - } - else if (input instanceof ObjectAdded) { - return convertToSObject((ObjectAdded)input); - } - else if (input instanceof ObjectRemoved) { - return convertToSObject((ObjectRemoved)input); - } - SCompareItem result = new SCompareItem(); + SGeometryInfo result = new SGeometryInfo(); result.setOid(input.getOid()); result.setRid(input.getRid()); - DataObject dataObjectVal = input.getDataObject(); - result.setDataObject(convertToSObject(dataObjectVal)); + result.setStartVertex(input.getStartVertex()); + result.setStartIndex(input.getStartIndex()); + result.setPrimitiveCount(input.getPrimitiveCount()); + result.setTransformation(input.getTransformation()); + result.setArea(input.getArea()); + result.setVolume(input.getVolume()); + result.setHasTransparency(input.isHasTransparency()); + result.setIfcProductOid(input.getIfcProductOid()); + result.setDensity(input.getDensity()); + Bounds boundsVal = input.getBounds(); + result.setBounds(convertToSObject(boundsVal)); + Bounds boundsUntransformedVal = input.getBoundsUntransformed(); + result.setBoundsUntransformed(convertToSObject(boundsUntransformedVal)); + GeometryData dataVal = input.getData(); + result.setDataId(dataVal == null ? -1 : dataVal.getOid()); + Bounds boundsMmVal = input.getBoundsMm(); + result.setBoundsMm(convertToSObject(boundsMmVal)); + Bounds boundsUntransformedMmVal = input.getBoundsUntransformedMm(); + result.setBoundsUntransformedMm(convertToSObject(boundsUntransformedMmVal)); return result; } - public CompareItem convertFromSObject(SCompareItem input, DatabaseSession session) throws BimserverDatabaseException { + public GeometryInfo convertFromSObject(SGeometryInfo input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - CompareItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareItem(), session); + GeometryInfo result = convertFromSObject(input, GeometryFactory.eINSTANCE.createGeometryInfo(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -3167,79 +2722,84 @@ public CompareItem convertFromSObject(SCompareItem input, DatabaseSession sessio return result; } - public CompareItem convertFromSObject(SCompareItem input) throws BimserverDatabaseException { - CompareItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareItem(), null); + public GeometryInfo convertFromSObject(SGeometryInfo input) throws BimserverDatabaseException { + GeometryInfo result = convertFromSObject(input, GeometryFactory.eINSTANCE.createGeometryInfo(), null); return result; } - public CompareItem convertFromSObject(SCompareItem input, CompareItem result, DatabaseSession session) throws BimserverDatabaseException { + public GeometryInfo convertFromSObject(SGeometryInfo input, GeometryInfo result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - if (input instanceof SObjectModified) { - return convertFromSObject((SObjectModified)input, session); - } - else if (input instanceof SObjectAdded) { - return convertFromSObject((SObjectAdded)input, session); - } - else if (input instanceof SObjectRemoved) { - return convertFromSObject((SObjectRemoved)input, session); - } - result.setDataObject(convertFromSObject(input.getDataObject(), session)); + result.setStartVertex(input.getStartVertex()); + result.setStartIndex(input.getStartIndex()); + result.setPrimitiveCount(input.getPrimitiveCount()); + result.setTransformation(input.getTransformation()); + result.setArea(input.getArea()); + result.setVolume(input.getVolume()); + result.setHasTransparency(input.isHasTransparency()); + result.setIfcProductOid(input.getIfcProductOid()); + result.setDensity(input.getDensity()); + result.setBounds(convertFromSObject(input.getBounds(), session)); + result.setBoundsUntransformed(convertFromSObject(input.getBoundsUntransformed(), session)); + result.setData((GeometryData)session.get(GeometryPackage.eINSTANCE.getGeometryData(), input.getDataId(), OldQuery.getDefault())); + result.setBoundsMm(convertFromSObject(input.getBoundsMm(), session)); + result.setBoundsUntransformedMm(convertFromSObject(input.getBoundsUntransformedMm(), session)); return result; } - public Set convertToSSetObjectAdded(Collection input) { - Set result = new HashSet(); - for (ObjectAdded o : input) { + public Set convertToSSetVector3f(Collection input) { + Set result = new HashSet(); + for (Vector3f o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetObjectAdded(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SObjectAdded o : input) { + public Set convertFromSSetVector3f(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SVector3f o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListObjectAdded(Collection input) { - List result = new ArrayList(); - for (ObjectAdded o : input) { + public List convertToSListVector3f(Collection input) { + List result = new ArrayList(); + for (Vector3f o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListObjectAdded(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SObjectAdded o : input) { + public List convertFromSListVector3f(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SVector3f o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SObjectAdded convertToSObject(ObjectAdded input) { + public SVector3f convertToSObject(Vector3f input) { if (input == null) { return null; } - SObjectAdded result = new SObjectAdded(); + SVector3f result = new SVector3f(); result.setOid(input.getOid()); result.setRid(input.getRid()); - DataObject dataObjectVal = input.getDataObject(); - result.setDataObject(convertToSObject(dataObjectVal)); + result.setX(input.getX()); + result.setY(input.getY()); + result.setZ(input.getZ()); return result; } - public ObjectAdded convertFromSObject(SObjectAdded input, DatabaseSession session) throws BimserverDatabaseException { + public Vector3f convertFromSObject(SVector3f input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ObjectAdded result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectAdded(), session); + Vector3f result = convertFromSObject(input, GeometryFactory.eINSTANCE.createVector3f(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -3247,70 +2807,74 @@ public ObjectAdded convertFromSObject(SObjectAdded input, DatabaseSession sessio return result; } - public ObjectAdded convertFromSObject(SObjectAdded input) throws BimserverDatabaseException { - ObjectAdded result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectAdded(), null); + public Vector3f convertFromSObject(SVector3f input) throws BimserverDatabaseException { + Vector3f result = convertFromSObject(input, GeometryFactory.eINSTANCE.createVector3f(), null); return result; } - public ObjectAdded convertFromSObject(SObjectAdded input, ObjectAdded result, DatabaseSession session) throws BimserverDatabaseException { + public Vector3f convertFromSObject(SVector3f input, Vector3f result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDataObject(convertFromSObject(input.getDataObject(), session)); + result.setX(input.getX()); + result.setY(input.getY()); + result.setZ(input.getZ()); return result; } - public Set convertToSSetObjectRemoved(Collection input) { - Set result = new HashSet(); - for (ObjectRemoved o : input) { + public Set convertToSSetBounds(Collection input) { + Set result = new HashSet(); + for (Bounds o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetObjectRemoved(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SObjectRemoved o : input) { + public Set convertFromSSetBounds(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SBounds o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListObjectRemoved(Collection input) { - List result = new ArrayList(); - for (ObjectRemoved o : input) { + public List convertToSListBounds(Collection input) { + List result = new ArrayList(); + for (Bounds o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListObjectRemoved(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SObjectRemoved o : input) { + public List convertFromSListBounds(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SBounds o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SObjectRemoved convertToSObject(ObjectRemoved input) { + public SBounds convertToSObject(Bounds input) { if (input == null) { return null; } - SObjectRemoved result = new SObjectRemoved(); + SBounds result = new SBounds(); result.setOid(input.getOid()); result.setRid(input.getRid()); - DataObject dataObjectVal = input.getDataObject(); - result.setDataObject(convertToSObject(dataObjectVal)); + Vector3f minVal = input.getMin(); + result.setMin(convertToSObject(minVal)); + Vector3f maxVal = input.getMax(); + result.setMax(convertToSObject(maxVal)); return result; } - public ObjectRemoved convertFromSObject(SObjectRemoved input, DatabaseSession session) throws BimserverDatabaseException { + public Bounds convertFromSObject(SBounds input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ObjectRemoved result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectRemoved(), session); + Bounds result = convertFromSObject(input, GeometryFactory.eINSTANCE.createBounds(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -3318,73 +2882,70 @@ public ObjectRemoved convertFromSObject(SObjectRemoved input, DatabaseSession se return result; } - public ObjectRemoved convertFromSObject(SObjectRemoved input) throws BimserverDatabaseException { - ObjectRemoved result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectRemoved(), null); + public Bounds convertFromSObject(SBounds input) throws BimserverDatabaseException { + Bounds result = convertFromSObject(input, GeometryFactory.eINSTANCE.createBounds(), null); return result; } - public ObjectRemoved convertFromSObject(SObjectRemoved input, ObjectRemoved result, DatabaseSession session) throws BimserverDatabaseException { + public Bounds convertFromSObject(SBounds input, Bounds result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDataObject(convertFromSObject(input.getDataObject(), session)); + result.setMin(convertFromSObject(input.getMin(), session)); + result.setMax(convertFromSObject(input.getMax(), session)); return result; } - public Set convertToSSetObjectModified(Collection input) { - Set result = new HashSet(); - for (ObjectModified o : input) { + public Set convertToSSetBuffer(Collection input) { + Set result = new HashSet(); + for (Buffer o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetObjectModified(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SObjectModified o : input) { + public Set convertFromSSetBuffer(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SBuffer o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListObjectModified(Collection input) { - List result = new ArrayList(); - for (ObjectModified o : input) { + public List convertToSListBuffer(Collection input) { + List result = new ArrayList(); + for (Buffer o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListObjectModified(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SObjectModified o : input) { + public List convertFromSListBuffer(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SBuffer o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SObjectModified convertToSObject(ObjectModified input) { + public SBuffer convertToSObject(Buffer input) { if (input == null) { return null; } - SObjectModified result = new SObjectModified(); + SBuffer result = new SBuffer(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setFieldName(input.getFieldName()); - result.setOldValue(input.getOldValue()); - result.setNewValue(input.getNewValue()); - DataObject dataObjectVal = input.getDataObject(); - result.setDataObject(convertToSObject(dataObjectVal)); + result.setData(input.getData()); return result; } - public ObjectModified convertFromSObject(SObjectModified input, DatabaseSession session) throws BimserverDatabaseException { + public Buffer convertFromSObject(SBuffer input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ObjectModified result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectModified(), session); + Buffer result = convertFromSObject(input, GeometryFactory.eINSTANCE.createBuffer(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -3392,77 +2953,94 @@ public ObjectModified convertFromSObject(SObjectModified input, DatabaseSession return result; } - public ObjectModified convertFromSObject(SObjectModified input) throws BimserverDatabaseException { - ObjectModified result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectModified(), null); + public Buffer convertFromSObject(SBuffer input) throws BimserverDatabaseException { + Buffer result = convertFromSObject(input, GeometryFactory.eINSTANCE.createBuffer(), null); return result; } - public ObjectModified convertFromSObject(SObjectModified input, ObjectModified result, DatabaseSession session) throws BimserverDatabaseException { + public Buffer convertFromSObject(SBuffer input, Buffer result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setFieldName(input.getFieldName()); - result.setOldValue(input.getOldValue()); - result.setNewValue(input.getNewValue()); - result.setDataObject(convertFromSObject(input.getDataObject(), session)); + result.setData(input.getData()); return result; } - public Set convertToSSetCompareContainer(Collection input) { - Set result = new HashSet(); - for (CompareContainer o : input) { + public Set convertToSSetGeometryData(Collection input) { + Set result = new HashSet(); + for (GeometryData o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetCompareContainer(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SCompareContainer o : input) { + public Set convertFromSSetGeometryData(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SGeometryData o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListCompareContainer(Collection input) { - List result = new ArrayList(); - for (CompareContainer o : input) { - result.add(convertToSObject(o)); + public List convertToSListGeometryData(Collection input) { + List result = new ArrayList(); + for (GeometryData o : input) { + result.add(convertToSObject(o)); } return result; } - public List convertFromSListCompareContainer(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SCompareContainer o : input) { + public List convertFromSListGeometryData(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SGeometryData o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SCompareContainer convertToSObject(CompareContainer input) { + public SGeometryData convertToSObject(GeometryData input) { if (input == null) { return null; } - SCompareContainer result = new SCompareContainer(); + SGeometryData result = new SGeometryData(); result.setOid(input.getOid()); result.setRid(input.getRid()); + result.setNrIndices(input.getNrIndices()); + result.setNrVertices(input.getNrVertices()); + result.setNrNormals(input.getNrNormals()); + result.setNrColors(input.getNrColors()); + result.setHasTransparency(input.isHasTransparency()); + result.setReused(input.getReused()); result.setType(input.getType()); - List listitems = new ArrayList(); - for (CompareItem v : input.getItems()) { - listitems.add(convertToSObject(v)); - } - result.setItems(listitems); + result.setSaveableTriangles(input.getSaveableTriangles()); + Buffer indicesVal = input.getIndices(); + result.setIndicesId(indicesVal == null ? -1 : indicesVal.getOid()); + Buffer verticesVal = input.getVertices(); + result.setVerticesId(verticesVal == null ? -1 : verticesVal.getOid()); + Buffer verticesQuantizedVal = input.getVerticesQuantized(); + result.setVerticesQuantizedId(verticesQuantizedVal == null ? -1 : verticesQuantizedVal.getOid()); + Buffer normalsVal = input.getNormals(); + result.setNormalsId(normalsVal == null ? -1 : normalsVal.getOid()); + Buffer normalsQuantizedVal = input.getNormalsQuantized(); + result.setNormalsQuantizedId(normalsQuantizedVal == null ? -1 : normalsQuantizedVal.getOid()); + Buffer colorsQuantizedVal = input.getColorsQuantized(); + result.setColorsQuantizedId(colorsQuantizedVal == null ? -1 : colorsQuantizedVal.getOid()); + Vector4f colorVal = input.getColor(); + result.setColor(convertToSObject(colorVal)); + Vector4f mostUsedColorVal = input.getMostUsedColor(); + result.setMostUsedColor(convertToSObject(mostUsedColorVal)); + Bounds boundsMmVal = input.getBoundsMm(); + result.setBoundsMm(convertToSObject(boundsMmVal)); return result; } - public CompareContainer convertFromSObject(SCompareContainer input, DatabaseSession session) throws BimserverDatabaseException { + public GeometryData convertFromSObject(SGeometryData input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - CompareContainer result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareContainer(), session); + GeometryData result = convertFromSObject(input, GeometryFactory.eINSTANCE.createGeometryData(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -3470,77 +3048,88 @@ public CompareContainer convertFromSObject(SCompareContainer input, DatabaseSess return result; } - public CompareContainer convertFromSObject(SCompareContainer input) throws BimserverDatabaseException { - CompareContainer result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareContainer(), null); + public GeometryData convertFromSObject(SGeometryData input) throws BimserverDatabaseException { + GeometryData result = convertFromSObject(input, GeometryFactory.eINSTANCE.createGeometryData(), null); return result; } - public CompareContainer convertFromSObject(SCompareContainer input, CompareContainer result, DatabaseSession session) throws BimserverDatabaseException { + public GeometryData convertFromSObject(SGeometryData input, GeometryData result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } + result.setNrIndices(input.getNrIndices()); + result.setNrVertices(input.getNrVertices()); + result.setNrNormals(input.getNrNormals()); + result.setNrColors(input.getNrColors()); + result.setHasTransparency(input.isHasTransparency()); + result.setReused(input.getReused()); result.setType(input.getType()); - List listitems = result.getItems(); - for (SCompareItem v : input.getItems()) { - listitems.add(convertFromSObject(v, session)); - } + result.setSaveableTriangles(input.getSaveableTriangles()); + result.setIndices((Buffer)session.get(GeometryPackage.eINSTANCE.getBuffer(), input.getIndicesId(), OldQuery.getDefault())); + result.setVertices((Buffer)session.get(GeometryPackage.eINSTANCE.getBuffer(), input.getVerticesId(), OldQuery.getDefault())); + result.setVerticesQuantized((Buffer)session.get(GeometryPackage.eINSTANCE.getBuffer(), input.getVerticesQuantizedId(), OldQuery.getDefault())); + result.setNormals((Buffer)session.get(GeometryPackage.eINSTANCE.getBuffer(), input.getNormalsId(), OldQuery.getDefault())); + result.setNormalsQuantized((Buffer)session.get(GeometryPackage.eINSTANCE.getBuffer(), input.getNormalsQuantizedId(), OldQuery.getDefault())); + result.setColorsQuantized((Buffer)session.get(GeometryPackage.eINSTANCE.getBuffer(), input.getColorsQuantizedId(), OldQuery.getDefault())); + result.setColor(convertFromSObject(input.getColor(), session)); + result.setMostUsedColor(convertFromSObject(input.getMostUsedColor(), session)); + result.setBoundsMm(convertFromSObject(input.getBoundsMm(), session)); return result; } - public Set convertToSSetCompareResult(Collection input) { - Set result = new HashSet(); - for (CompareResult o : input) { + public Set convertToSSetVector4f(Collection input) { + Set result = new HashSet(); + for (Vector4f o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetCompareResult(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SCompareResult o : input) { + public Set convertFromSSetVector4f(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SVector4f o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListCompareResult(Collection input) { - List result = new ArrayList(); - for (CompareResult o : input) { + public List convertToSListVector4f(Collection input) { + List result = new ArrayList(); + for (Vector4f o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListCompareResult(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SCompareResult o : input) { + public List convertFromSListVector4f(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SVector4f o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SCompareResult convertToSObject(CompareResult input) { + public SVector4f convertToSObject(Vector4f input) { if (input == null) { return null; } - SCompareResult result = new SCompareResult(); + SVector4f result = new SVector4f(); result.setOid(input.getOid()); result.setRid(input.getRid()); - List listitems = new ArrayList(); - for (CompareContainer v : input.getItems()) { - listitems.add(convertToSObject(v)); - } - result.setItems(listitems); + result.setX(input.getX()); + result.setY(input.getY()); + result.setZ(input.getZ()); + result.setW(input.getW()); return result; } - public CompareResult convertFromSObject(SCompareResult input, DatabaseSession session) throws BimserverDatabaseException { + public Vector4f convertFromSObject(SVector4f input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - CompareResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareResult(), session); + Vector4f result = convertFromSObject(input, GeometryFactory.eINSTANCE.createVector4f(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -3548,175 +3137,336 @@ public CompareResult convertFromSObject(SCompareResult input, DatabaseSession se return result; } - public CompareResult convertFromSObject(SCompareResult input) throws BimserverDatabaseException { - CompareResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareResult(), null); + public Vector4f convertFromSObject(SVector4f input) throws BimserverDatabaseException { + Vector4f result = convertFromSObject(input, GeometryFactory.eINSTANCE.createVector4f(), null); return result; } - public CompareResult convertFromSObject(SCompareResult input, CompareResult result, DatabaseSession session) throws BimserverDatabaseException { + public Vector4f convertFromSObject(SVector4f input, Vector4f result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - List listitems = result.getItems(); - for (SCompareContainer v : input.getItems()) { - listitems.add(convertFromSObject(v, session)); - } + result.setX(input.getX()); + result.setY(input.getY()); + result.setZ(input.getZ()); + result.setW(input.getW()); return result; } - public SActionState convertToSObject(ActionState input) { - return SActionState.values()[input.ordinal()]; + public SUserType convertToSObject(UserType input) { + return SUserType.values()[input.ordinal()]; } - public ActionState convertFromSObject(SActionState input) { - return ActionState.values()[input.ordinal()]; + public UserType convertFromSObject(SUserType input) { + return UserType.values()[input.ordinal()]; + } + public SSIPrefix convertToSObject(SIPrefix input) { + return SSIPrefix.values()[input.ordinal()]; + } + + public SIPrefix convertFromSObject(SSIPrefix input) { + return SIPrefix.values()[input.ordinal()]; + } + public SObjectState convertToSObject(ObjectState input) { + return SObjectState.values()[input.ordinal()]; + } + + public ObjectState convertFromSObject(SObjectState input) { + return ObjectState.values()[input.ordinal()]; } - public Set convertToSSetLongActionState(Collection input) { - Set result = new HashSet(); - for (LongActionState o : input) { + public Set convertToSSetProject(Collection input) { + Set result = new HashSet(); + for (Project o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetLongActionState(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SLongActionState o : input) { + public Set convertFromSSetProject(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SProject o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListLongActionState(Collection input) { - List result = new ArrayList(); - for (LongActionState o : input) { + public List convertToSListProject(Collection input) { + List result = new ArrayList(); + for (Project o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListLongActionState(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SLongActionState o : input) { + public List convertFromSListProject(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SProject o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SLongActionState convertToSObject(LongActionState input) { + public SProject convertToSObject(Project input) { if (input == null) { return null; } - SLongActionState result = new SLongActionState(); + SProject result = new SProject(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setStart(input.getStart()); - result.setEnd(input.getEnd()); - result.setProgress(input.getProgress()); - result.setState(SActionState.values()[input.getState().ordinal()]); - result.setTitle(input.getTitle()); - result.setStage(input.getStage()); - result.getErrors().addAll(input.getErrors()); - result.getWarnings().addAll(input.getWarnings()); - result.getInfos().addAll(input.getInfos()); - return result; - } - - public LongActionState convertFromSObject(SLongActionState input, DatabaseSession session) throws BimserverDatabaseException { - if (session == null) { - throw new BimserverDatabaseException("session == null, use the other method"); + result.setId(input.getId()); + result.setName(input.getName()); + result.setState(SObjectState.values()[input.getState().ordinal()]); + result.setCreatedDate(input.getCreatedDate()); + result.setDescription(input.getDescription()); + result.setExportLengthMeasurePrefix(SSIPrefix.values()[input.getExportLengthMeasurePrefix().ordinal()]); + result.setSchema(input.getSchema()); + result.setSendEmailOnNewRevision(input.isSendEmailOnNewRevision()); + result.setCheckinInProgress(input.getCheckinInProgress()); + result.setUuid(input.getUuid()); + List listhasAuthorizedUsers = new ArrayList(); + for (User v : input.getHasAuthorizedUsers()) { + listhasAuthorizedUsers.add(v.getOid()); } - LOGGER.info("Potential unlinked object created"); - LongActionState result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongActionState(), session); - - ((IdEObjectImpl)result).setOid(input.getOid()); - ((IdEObjectImpl)result).setRid(input.getRid()); - - return result; - } - - public LongActionState convertFromSObject(SLongActionState input) throws BimserverDatabaseException { - LongActionState result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongActionState(), null); - return result; - } - - public LongActionState convertFromSObject(SLongActionState input, LongActionState result, DatabaseSession session) throws BimserverDatabaseException { - if (input == null) { - return null; + result.setHasAuthorizedUsers(listhasAuthorizedUsers); + List listconcreteRevisions = new ArrayList(); + for (ConcreteRevision v : input.getConcreteRevisions()) { + listconcreteRevisions.add(v.getOid()); } - result.setStart(input.getStart()); - result.setEnd(input.getEnd()); - result.setProgress(input.getProgress()); - result.setState(ActionState.values()[input.getState().ordinal()]); - result.setTitle(input.getTitle()); - result.setStage(input.getStage()); - result.getErrors().addAll(input.getErrors()); - result.getWarnings().addAll(input.getWarnings()); - result.getInfos().addAll(input.getInfos()); - return result; - } - public SServerState convertToSObject(ServerState input) { - return SServerState.values()[input.ordinal()]; + result.setConcreteRevisions(listconcreteRevisions); + List listrevisions = new ArrayList(); + for (Revision v : input.getRevisions()) { + listrevisions.add(v.getOid()); } - - public ServerState convertFromSObject(SServerState input) { - return ServerState.values()[input.ordinal()]; + result.setRevisions(listrevisions); + ConcreteRevision lastConcreteRevisionVal = input.getLastConcreteRevision(); + result.setLastConcreteRevisionId(lastConcreteRevisionVal == null ? -1 : lastConcreteRevisionVal.getOid()); + Revision lastRevisionVal = input.getLastRevision(); + result.setLastRevisionId(lastRevisionVal == null ? -1 : lastRevisionVal.getOid()); + List listcheckouts = new ArrayList(); + for (Checkout v : input.getCheckouts()) { + listcheckouts.add(v.getOid()); } + result.setCheckouts(listcheckouts); + User createdByVal = input.getCreatedBy(); + result.setCreatedById(createdByVal == null ? -1 : createdByVal.getOid()); + GeoTag geoTagVal = input.getGeoTag(); + result.setGeoTagId(geoTagVal == null ? -1 : geoTagVal.getOid()); + List listsubProjects = new ArrayList(); + for (Project v : input.getSubProjects()) { + listsubProjects.add(v.getOid()); + } + result.setSubProjects(listsubProjects); + Project parentVal = input.getParent(); + result.setParentId(parentVal == null ? -1 : parentVal.getOid()); + List listextendedData = new ArrayList(); + for (ExtendedData v : input.getExtendedData()) { + listextendedData.add(v.getOid()); + } + result.setExtendedData(listextendedData); + List listservices = new ArrayList(); + for (Service v : input.getServices()) { + listservices.add(v.getOid()); + } + result.setServices(listservices); + List listlogs = new ArrayList(); + for (ProjectRelated v : input.getLogs()) { + listlogs.add(v.getOid()); + } + result.setLogs(listlogs); + List listmodelCheckers = new ArrayList(); + for (ModelCheckerInstance v : input.getModelCheckers()) { + listmodelCheckers.add(v.getOid()); + } + result.setModelCheckers(listmodelCheckers); + List listnewServices = new ArrayList(); + for (NewService v : input.getNewServices()) { + listnewServices.add(v.getOid()); + } + result.setNewServices(listnewServices); + return result; + } - public Set convertToSSetServerInfo(Collection input) { - Set result = new HashSet(); - for (ServerInfo o : input) { + public Project convertFromSObject(SProject input, DatabaseSession session) throws BimserverDatabaseException { + if (session == null) { + throw new BimserverDatabaseException("session == null, use the other method"); + } + LOGGER.info("Potential unlinked object created"); + Project result = convertFromSObject(input, StoreFactory.eINSTANCE.createProject(), session); + + ((IdEObjectImpl)result).setOid(input.getOid()); + ((IdEObjectImpl)result).setRid(input.getRid()); + + return result; + } + + public Project convertFromSObject(SProject input) throws BimserverDatabaseException { + Project result = convertFromSObject(input, StoreFactory.eINSTANCE.createProject(), null); + return result; + } + + public Project convertFromSObject(SProject input, Project result, DatabaseSession session) throws BimserverDatabaseException { + if (input == null) { + return null; + } + result.setId(input.getId()); + result.setName(input.getName()); + result.setState(ObjectState.values()[input.getState().ordinal()]); + result.setCreatedDate(input.getCreatedDate()); + result.setDescription(input.getDescription()); + result.setExportLengthMeasurePrefix(SIPrefix.values()[input.getExportLengthMeasurePrefix().ordinal()]); + result.setSchema(input.getSchema()); + result.setSendEmailOnNewRevision(input.isSendEmailOnNewRevision()); + result.setCheckinInProgress(input.getCheckinInProgress()); + result.setUuid(input.getUuid()); + List listhasAuthorizedUsers = result.getHasAuthorizedUsers(); + for (long oid : input.getHasAuthorizedUsers()) { + listhasAuthorizedUsers.add((User)session.get(StorePackage.eINSTANCE.getUser(), oid, OldQuery.getDefault())); + } + List listconcreteRevisions = result.getConcreteRevisions(); + for (long oid : input.getConcreteRevisions()) { + listconcreteRevisions.add((ConcreteRevision)session.get(StorePackage.eINSTANCE.getConcreteRevision(), oid, OldQuery.getDefault())); + } + List listrevisions = result.getRevisions(); + for (long oid : input.getRevisions()) { + listrevisions.add((Revision)session.get(StorePackage.eINSTANCE.getRevision(), oid, OldQuery.getDefault())); + } + result.setLastConcreteRevision((ConcreteRevision)session.get(StorePackage.eINSTANCE.getConcreteRevision(), input.getLastConcreteRevisionId(), OldQuery.getDefault())); + result.setLastRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getLastRevisionId(), OldQuery.getDefault())); + List listcheckouts = result.getCheckouts(); + for (long oid : input.getCheckouts()) { + listcheckouts.add((Checkout)session.get(StorePackage.eINSTANCE.getCheckout(), oid, OldQuery.getDefault())); + } + result.setCreatedBy((User)session.get(StorePackage.eINSTANCE.getUser(), input.getCreatedById(), OldQuery.getDefault())); + result.setGeoTag((GeoTag)session.get(StorePackage.eINSTANCE.getGeoTag(), input.getGeoTagId(), OldQuery.getDefault())); + List listsubProjects = result.getSubProjects(); + for (long oid : input.getSubProjects()) { + listsubProjects.add((Project)session.get(StorePackage.eINSTANCE.getProject(), oid, OldQuery.getDefault())); + } + result.setParent((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getParentId(), OldQuery.getDefault())); + List listextendedData = result.getExtendedData(); + for (long oid : input.getExtendedData()) { + listextendedData.add((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), oid, OldQuery.getDefault())); + } + List listservices = result.getServices(); + for (long oid : input.getServices()) { + listservices.add((Service)session.get(StorePackage.eINSTANCE.getService(), oid, OldQuery.getDefault())); + } + List listlogs = result.getLogs(); + for (long oid : input.getLogs()) { + listlogs.add((ProjectRelated)session.get(LogPackage.eINSTANCE.getProjectRelated(), oid, OldQuery.getDefault())); + } + List listmodelCheckers = result.getModelCheckers(); + for (long oid : input.getModelCheckers()) { + listmodelCheckers.add((ModelCheckerInstance)session.get(StorePackage.eINSTANCE.getModelCheckerInstance(), oid, OldQuery.getDefault())); + } + List listnewServices = result.getNewServices(); + for (long oid : input.getNewServices()) { + listnewServices.add((NewService)session.get(StorePackage.eINSTANCE.getNewService(), oid, OldQuery.getDefault())); + } + return result; + } + + public Set convertToSSetUser(Collection input) { + Set result = new HashSet(); + for (User o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetServerInfo(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SServerInfo o : input) { + public Set convertFromSSetUser(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SUser o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListServerInfo(Collection input) { - List result = new ArrayList(); - for (ServerInfo o : input) { + public List convertToSListUser(Collection input) { + List result = new ArrayList(); + for (User o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListServerInfo(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SServerInfo o : input) { + public List convertFromSListUser(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SUser o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SServerInfo convertToSObject(ServerInfo input) { + public SUser convertToSObject(User input) { if (input == null) { return null; } - SServerInfo result = new SServerInfo(); + SUser result = new SUser(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setServerState(SServerState.values()[input.getServerState().ordinal()]); - result.setErrorMessage(input.getErrorMessage()); - Version versionVal = input.getVersion(); - result.setVersion(convertToSObject(versionVal)); + result.setName(input.getName()); + result.setPasswordHash(input.getPasswordHash()); + result.setPasswordSalt(input.getPasswordSalt()); + result.setState(SObjectState.values()[input.getState().ordinal()]); + result.setCreatedOn(input.getCreatedOn()); + result.setUserType(SUserType.values()[input.getUserType().ordinal()]); + result.setUsername(input.getUsername()); + result.setLastSeen(input.getLastSeen()); + result.setToken(input.getToken()); + result.setValidationToken(input.getValidationToken()); + result.setValidationTokenCreated(input.getValidationTokenCreated()); + result.setUuid(input.getUuid()); + List listhasRightsOn = new ArrayList(); + for (Project v : input.getHasRightsOn()) { + listhasRightsOn.add(v.getOid()); + } + result.setHasRightsOn(listhasRightsOn); + User createdByVal = input.getCreatedBy(); + result.setCreatedById(createdByVal == null ? -1 : createdByVal.getOid()); + UserSettings userSettingsVal = input.getUserSettings(); + result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid()); + List listschemas = new ArrayList(); + for (ExtendedDataSchema v : input.getSchemas()) { + listschemas.add(v.getOid()); + } + result.setSchemas(listschemas); + List listextendedData = new ArrayList(); + for (ExtendedData v : input.getExtendedData()) { + listextendedData.add(v.getOid()); + } + result.setExtendedData(listextendedData); + List listservices = new ArrayList(); + for (Service v : input.getServices()) { + listservices.add(v.getOid()); + } + result.setServices(listservices); + List listlogs = new ArrayList(); + for (UserRelated v : input.getLogs()) { + listlogs.add(v.getOid()); + } + result.setLogs(listlogs); + List listoAuthAuthorizationCodes = new ArrayList(); + for (OAuthAuthorizationCode v : input.getOAuthAuthorizationCodes()) { + listoAuthAuthorizationCodes.add(v.getOid()); + } + result.setOAuthAuthorizationCodes(listoAuthAuthorizationCodes); + List listoAuthIssuedAuthorizationCodes = new ArrayList(); + for (OAuthAuthorizationCode v : input.getOAuthIssuedAuthorizationCodes()) { + listoAuthIssuedAuthorizationCodes.add(v.getOid()); + } + result.setOAuthIssuedAuthorizationCodes(listoAuthIssuedAuthorizationCodes); return result; } - public ServerInfo convertFromSObject(SServerInfo input, DatabaseSession session) throws BimserverDatabaseException { + public User convertFromSObject(SUser input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ServerInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createServerInfo(), session); + User result = convertFromSObject(input, StoreFactory.eINSTANCE.createUser(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -3724,78 +3474,161 @@ public ServerInfo convertFromSObject(SServerInfo input, DatabaseSession session) return result; } - public ServerInfo convertFromSObject(SServerInfo input) throws BimserverDatabaseException { - ServerInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createServerInfo(), null); + public User convertFromSObject(SUser input) throws BimserverDatabaseException { + User result = convertFromSObject(input, StoreFactory.eINSTANCE.createUser(), null); return result; } - public ServerInfo convertFromSObject(SServerInfo input, ServerInfo result, DatabaseSession session) throws BimserverDatabaseException { + public User convertFromSObject(SUser input, User result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setServerState(ServerState.values()[input.getServerState().ordinal()]); - result.setErrorMessage(input.getErrorMessage()); - result.setVersion(convertFromSObject(input.getVersion(), session)); + result.setName(input.getName()); + result.setPasswordHash(input.getPasswordHash()); + result.setPasswordSalt(input.getPasswordSalt()); + result.setState(ObjectState.values()[input.getState().ordinal()]); + result.setCreatedOn(input.getCreatedOn()); + result.setUserType(UserType.values()[input.getUserType().ordinal()]); + result.setUsername(input.getUsername()); + result.setLastSeen(input.getLastSeen()); + result.setToken(input.getToken()); + result.setValidationToken(input.getValidationToken()); + result.setValidationTokenCreated(input.getValidationTokenCreated()); + result.setUuid(input.getUuid()); + List listhasRightsOn = result.getHasRightsOn(); + for (long oid : input.getHasRightsOn()) { + listhasRightsOn.add((Project)session.get(StorePackage.eINSTANCE.getProject(), oid, OldQuery.getDefault())); + } + result.setCreatedBy((User)session.get(StorePackage.eINSTANCE.getUser(), input.getCreatedById(), OldQuery.getDefault())); + result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault())); + List listschemas = result.getSchemas(); + for (long oid : input.getSchemas()) { + listschemas.add((ExtendedDataSchema)session.get(StorePackage.eINSTANCE.getExtendedDataSchema(), oid, OldQuery.getDefault())); + } + List listextendedData = result.getExtendedData(); + for (long oid : input.getExtendedData()) { + listextendedData.add((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), oid, OldQuery.getDefault())); + } + List listservices = result.getServices(); + for (long oid : input.getServices()) { + listservices.add((Service)session.get(StorePackage.eINSTANCE.getService(), oid, OldQuery.getDefault())); + } + List listlogs = result.getLogs(); + for (long oid : input.getLogs()) { + listlogs.add((UserRelated)session.get(LogPackage.eINSTANCE.getUserRelated(), oid, OldQuery.getDefault())); + } + List listoAuthAuthorizationCodes = result.getOAuthAuthorizationCodes(); + for (long oid : input.getOAuthAuthorizationCodes()) { + listoAuthAuthorizationCodes.add((OAuthAuthorizationCode)session.get(StorePackage.eINSTANCE.getOAuthAuthorizationCode(), oid, OldQuery.getDefault())); + } + List listoAuthIssuedAuthorizationCodes = result.getOAuthIssuedAuthorizationCodes(); + for (long oid : input.getOAuthIssuedAuthorizationCodes()) { + listoAuthIssuedAuthorizationCodes.add((OAuthAuthorizationCode)session.get(StorePackage.eINSTANCE.getOAuthAuthorizationCode(), oid, OldQuery.getDefault())); + } return result; } - public Set convertToSSetVersion(Collection input) { - Set result = new HashSet(); - for (Version o : input) { + public Set convertToSSetRevision(Collection input) { + Set result = new HashSet(); + for (Revision o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetVersion(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SVersion o : input) { + public Set convertFromSSetRevision(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SRevision o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListVersion(Collection input) { - List result = new ArrayList(); - for (Version o : input) { + public List convertToSListRevision(Collection input) { + List result = new ArrayList(); + for (Revision o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListVersion(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SVersion o : input) { + public List convertFromSListRevision(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SRevision o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SVersion convertToSObject(Version input) { + public SRevision convertToSObject(Revision input) { if (input == null) { return null; } - - SVersion result = new SVersion(); - result.setOid(input.getOid()); - result.setRid(input.getRid()); - result.setMajor(input.getMajor()); - result.setMinor(input.getMinor()); - result.setRevision(input.getRevision()); - result.setFullString(input.getFullString()); - result.setDate(input.getDate()); - result.setDownloadUrl(input.getDownloadUrl()); - result.setSupportUrl(input.getSupportUrl()); - result.setSupportEmail(input.getSupportEmail()); + + SRevision result = new SRevision(); + result.setOid(input.getOid()); + result.setRid(input.getRid()); + result.setId(input.getId()); + result.setDate(input.getDate()); + result.setComment(input.getComment()); + result.setSize(input.getSize()); + result.setTag(input.getTag()); + result.setLastError(input.getLastError()); + result.setBmi(input.getBmi()); + result.setHasGeometry(input.isHasGeometry()); + result.setNrPrimitives(input.getNrPrimitives()); + User userVal = input.getUser(); + result.setUserId(userVal == null ? -1 : userVal.getOid()); + List listconcreteRevisions = new ArrayList(); + for (ConcreteRevision v : input.getConcreteRevisions()) { + listconcreteRevisions.add(v.getOid()); + } + result.setConcreteRevisions(listconcreteRevisions); + ConcreteRevision lastConcreteRevisionVal = input.getLastConcreteRevision(); + result.setLastConcreteRevisionId(lastConcreteRevisionVal == null ? -1 : lastConcreteRevisionVal.getOid()); + List listcheckouts = new ArrayList(); + for (Checkout v : input.getCheckouts()) { + listcheckouts.add(v.getOid()); + } + result.setCheckouts(listcheckouts); + Project projectVal = input.getProject(); + result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); + List listextendedData = new ArrayList(); + for (ExtendedData v : input.getExtendedData()) { + listextendedData.add(v.getOid()); + } + result.setExtendedData(listextendedData); + List listlogs = new ArrayList(); + for (RevisionRelated v : input.getLogs()) { + listlogs.add(v.getOid()); + } + result.setLogs(listlogs); + Service serviceVal = input.getService(); + result.setServiceId(serviceVal == null ? -1 : serviceVal.getOid()); + Bounds boundsVal = input.getBounds(); + result.setBounds(convertToSObject(boundsVal)); + Bounds boundsUntransformedVal = input.getBoundsUntransformed(); + result.setBoundsUntransformed(convertToSObject(boundsUntransformedVal)); + Bounds boundsMmVal = input.getBoundsMm(); + result.setBoundsMm(convertToSObject(boundsMmVal)); + Bounds boundsUntransformedMmVal = input.getBoundsUntransformedMm(); + result.setBoundsUntransformedMm(convertToSObject(boundsUntransformedMmVal)); + List listservicesLinked = new ArrayList(); + for (NewService v : input.getServicesLinked()) { + listservicesLinked.add(v.getOid()); + } + result.setServicesLinked(listservicesLinked); + DensityCollection densityCollectionVal = input.getDensityCollection(); + result.setDensityCollectionId(densityCollectionVal == null ? -1 : densityCollectionVal.getOid()); return result; } - public Version convertFromSObject(SVersion input, DatabaseSession session) throws BimserverDatabaseException { + public Revision convertFromSObject(SRevision input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - Version result = convertFromSObject(input, StoreFactory.eINSTANCE.createVersion(), session); + Revision result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevision(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -3803,79 +3636,132 @@ public Version convertFromSObject(SVersion input, DatabaseSession session) throw return result; } - public Version convertFromSObject(SVersion input) throws BimserverDatabaseException { - Version result = convertFromSObject(input, StoreFactory.eINSTANCE.createVersion(), null); + public Revision convertFromSObject(SRevision input) throws BimserverDatabaseException { + Revision result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevision(), null); return result; } - public Version convertFromSObject(SVersion input, Version result, DatabaseSession session) throws BimserverDatabaseException { + public Revision convertFromSObject(SRevision input, Revision result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setMajor(input.getMajor()); - result.setMinor(input.getMinor()); - result.setRevision(input.getRevision()); - result.setFullString(input.getFullString()); + result.setId(input.getId()); result.setDate(input.getDate()); - result.setDownloadUrl(input.getDownloadUrl()); - result.setSupportUrl(input.getSupportUrl()); - result.setSupportEmail(input.getSupportEmail()); + result.setComment(input.getComment()); + result.setSize(input.getSize()); + result.setTag(input.getTag()); + result.setLastError(input.getLastError()); + result.setBmi(input.getBmi()); + result.setHasGeometry(input.isHasGeometry()); + result.setNrPrimitives(input.getNrPrimitives()); + result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); + List listconcreteRevisions = result.getConcreteRevisions(); + for (long oid : input.getConcreteRevisions()) { + listconcreteRevisions.add((ConcreteRevision)session.get(StorePackage.eINSTANCE.getConcreteRevision(), oid, OldQuery.getDefault())); + } + result.setLastConcreteRevision((ConcreteRevision)session.get(StorePackage.eINSTANCE.getConcreteRevision(), input.getLastConcreteRevisionId(), OldQuery.getDefault())); + List listcheckouts = result.getCheckouts(); + for (long oid : input.getCheckouts()) { + listcheckouts.add((Checkout)session.get(StorePackage.eINSTANCE.getCheckout(), oid, OldQuery.getDefault())); + } + result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); + List listextendedData = result.getExtendedData(); + for (long oid : input.getExtendedData()) { + listextendedData.add((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), oid, OldQuery.getDefault())); + } + List listlogs = result.getLogs(); + for (long oid : input.getLogs()) { + listlogs.add((RevisionRelated)session.get(LogPackage.eINSTANCE.getRevisionRelated(), oid, OldQuery.getDefault())); + } + result.setService((Service)session.get(StorePackage.eINSTANCE.getService(), input.getServiceId(), OldQuery.getDefault())); + result.setBounds(convertFromSObject(input.getBounds(), session)); + result.setBoundsUntransformed(convertFromSObject(input.getBoundsUntransformed(), session)); + result.setBoundsMm(convertFromSObject(input.getBoundsMm(), session)); + result.setBoundsUntransformedMm(convertFromSObject(input.getBoundsUntransformedMm(), session)); + List listservicesLinked = result.getServicesLinked(); + for (long oid : input.getServicesLinked()) { + listservicesLinked.add((NewService)session.get(StorePackage.eINSTANCE.getNewService(), oid, OldQuery.getDefault())); + } + result.setDensityCollection((DensityCollection)session.get(StorePackage.eINSTANCE.getDensityCollection(), input.getDensityCollectionId(), OldQuery.getDefault())); return result; } - public Set convertToSSetFile(Collection input) { - Set result = new HashSet(); - for (File o : input) { + public Set convertToSSetConcreteRevision(Collection input) { + Set result = new HashSet(); + for (ConcreteRevision o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetFile(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SFile o : input) { + public Set convertFromSSetConcreteRevision(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SConcreteRevision o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListFile(Collection input) { - List result = new ArrayList(); - for (File o : input) { + public List convertToSListConcreteRevision(Collection input) { + List result = new ArrayList(); + for (ConcreteRevision o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListFile(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SFile o : input) { + public List convertFromSListConcreteRevision(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SConcreteRevision o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SFile convertToSObject(File input) { + public SConcreteRevision convertToSObject(ConcreteRevision input) { if (input == null) { return null; } - SFile result = new SFile(); + SConcreteRevision result = new SConcreteRevision(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setData(input.getData()); - result.setFilename(input.getFilename()); - result.setMime(input.getMime()); + result.setId(input.getId()); + result.setChecksum(input.getChecksum()); result.setSize(input.getSize()); + result.setDate(input.getDate()); + result.setLastError(input.getLastError()); + result.setClear(input.isClear()); + result.setOidCounters(input.getOidCounters()); + result.setMultiplierToMm(input.getMultiplierToMm()); + Project projectVal = input.getProject(); + result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); + List listrevisions = new ArrayList(); + for (Revision v : input.getRevisions()) { + listrevisions.add(v.getOid()); + } + result.setRevisions(listrevisions); + RevisionSummary summaryVal = input.getSummary(); + result.setSummaryId(summaryVal == null ? -1 : summaryVal.getOid()); + User userVal = input.getUser(); + result.setUserId(userVal == null ? -1 : userVal.getOid()); + IfcHeader ifcHeaderVal = input.getIfcHeader(); + result.setIfcHeaderId(ifcHeaderVal == null ? -1 : ifcHeaderVal.getOid()); + Bounds boundsVal = input.getBounds(); + result.setBounds(convertToSObject(boundsVal)); + Bounds boundsUntransformedVal = input.getBoundsUntransformed(); + result.setBoundsUntransformed(convertToSObject(boundsUntransformedVal)); + DensityCollection densityCollectionVal = input.getDensityCollection(); + result.setDensityCollectionId(densityCollectionVal == null ? -1 : densityCollectionVal.getOid()); return result; } - public File convertFromSObject(SFile input, DatabaseSession session) throws BimserverDatabaseException { + public ConcreteRevision convertFromSObject(SConcreteRevision input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - File result = convertFromSObject(input, StoreFactory.eINSTANCE.createFile(), session); + ConcreteRevision result = convertFromSObject(input, StoreFactory.eINSTANCE.createConcreteRevision(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -3883,88 +3769,97 @@ public File convertFromSObject(SFile input, DatabaseSession session) throws Bims return result; } - public File convertFromSObject(SFile input) throws BimserverDatabaseException { - File result = convertFromSObject(input, StoreFactory.eINSTANCE.createFile(), null); + public ConcreteRevision convertFromSObject(SConcreteRevision input) throws BimserverDatabaseException { + ConcreteRevision result = convertFromSObject(input, StoreFactory.eINSTANCE.createConcreteRevision(), null); return result; } - public File convertFromSObject(SFile input, File result, DatabaseSession session) throws BimserverDatabaseException { + public ConcreteRevision convertFromSObject(SConcreteRevision input, ConcreteRevision result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setData(input.getData()); - result.setFilename(input.getFilename()); - result.setMime(input.getMime()); + result.setId(input.getId()); + result.setChecksum(input.getChecksum()); result.setSize(input.getSize()); + result.setDate(input.getDate()); + result.setLastError(input.getLastError()); + result.setClear(input.isClear()); + result.setOidCounters(input.getOidCounters()); + result.setMultiplierToMm(input.getMultiplierToMm()); + result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); + List listrevisions = result.getRevisions(); + for (long oid : input.getRevisions()) { + listrevisions.add((Revision)session.get(StorePackage.eINSTANCE.getRevision(), oid, OldQuery.getDefault())); + } + result.setSummary((RevisionSummary)session.get(StorePackage.eINSTANCE.getRevisionSummary(), input.getSummaryId(), OldQuery.getDefault())); + result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); + result.setIfcHeader((IfcHeader)session.get(StorePackage.eINSTANCE.getIfcHeader(), input.getIfcHeaderId(), OldQuery.getDefault())); + result.setBounds(convertFromSObject(input.getBounds(), session)); + result.setBoundsUntransformed(convertFromSObject(input.getBoundsUntransformed(), session)); + result.setDensityCollection((DensityCollection)session.get(StorePackage.eINSTANCE.getDensityCollection(), input.getDensityCollectionId(), OldQuery.getDefault())); return result; } - public Set convertToSSetExtendedDataSchema(Collection input) { - Set result = new HashSet(); - for (ExtendedDataSchema o : input) { + public Set convertToSSetGeoTag(Collection input) { + Set result = new HashSet(); + for (GeoTag o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetExtendedDataSchema(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SExtendedDataSchema o : input) { + public Set convertFromSSetGeoTag(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SGeoTag o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListExtendedDataSchema(Collection input) { - List result = new ArrayList(); - for (ExtendedDataSchema o : input) { + public List convertToSListGeoTag(Collection input) { + List result = new ArrayList(); + for (GeoTag o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListExtendedDataSchema(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SExtendedDataSchema o : input) { + public List convertFromSListGeoTag(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SGeoTag o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SExtendedDataSchema convertToSObject(ExtendedDataSchema input) { + public SGeoTag convertToSObject(GeoTag input) { if (input == null) { return null; } - SExtendedDataSchema result = new SExtendedDataSchema(); + SGeoTag result = new SGeoTag(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setName(input.getName()); - result.setUrl(input.getUrl()); - result.setContentType(input.getContentType()); - result.setDescription(input.getDescription()); - result.setSize(input.getSize()); - File fileVal = input.getFile(); - result.setFileId(fileVal == null ? -1 : fileVal.getOid()); - List listusers = new ArrayList(); - for (User v : input.getUsers()) { - listusers.add(v.getOid()); - } - result.setUsers(listusers); - List listextendedData = new ArrayList(); - for (ExtendedData v : input.getExtendedData()) { - listextendedData.add(v.getOid()); + result.setEnabled(input.getEnabled()); + result.setX(input.getX()); + result.setY(input.getY()); + result.setZ(input.getZ()); + result.setEpsg(input.getEpsg()); + result.setDirectionAngle(input.getDirectionAngle()); + List listprojects = new ArrayList(); + for (Project v : input.getProjects()) { + listprojects.add(v.getOid()); } - result.setExtendedData(listextendedData); + result.setProjects(listprojects); return result; } - public ExtendedDataSchema convertFromSObject(SExtendedDataSchema input, DatabaseSession session) throws BimserverDatabaseException { + public GeoTag convertFromSObject(SGeoTag input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ExtendedDataSchema result = convertFromSObject(input, StoreFactory.eINSTANCE.createExtendedDataSchema(), session); + GeoTag result = convertFromSObject(input, StoreFactory.eINSTANCE.createGeoTag(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -3972,95 +3867,92 @@ public ExtendedDataSchema convertFromSObject(SExtendedDataSchema input, Database return result; } - public ExtendedDataSchema convertFromSObject(SExtendedDataSchema input) throws BimserverDatabaseException { - ExtendedDataSchema result = convertFromSObject(input, StoreFactory.eINSTANCE.createExtendedDataSchema(), null); + public GeoTag convertFromSObject(SGeoTag input) throws BimserverDatabaseException { + GeoTag result = convertFromSObject(input, StoreFactory.eINSTANCE.createGeoTag(), null); return result; } - public ExtendedDataSchema convertFromSObject(SExtendedDataSchema input, ExtendedDataSchema result, DatabaseSession session) throws BimserverDatabaseException { + public GeoTag convertFromSObject(SGeoTag input, GeoTag result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setName(input.getName()); - result.setUrl(input.getUrl()); - result.setContentType(input.getContentType()); - result.setDescription(input.getDescription()); - result.setSize(input.getSize()); - result.setFile((File)session.get(StorePackage.eINSTANCE.getFile(), input.getFileId(), OldQuery.getDefault())); - List listusers = result.getUsers(); - for (long oid : input.getUsers()) { - listusers.add((User)session.get(StorePackage.eINSTANCE.getUser(), oid, OldQuery.getDefault())); - } - List listextendedData = result.getExtendedData(); - for (long oid : input.getExtendedData()) { - listextendedData.add((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), oid, OldQuery.getDefault())); + result.setEnabled(input.getEnabled()); + result.setX(input.getX()); + result.setY(input.getY()); + result.setZ(input.getZ()); + result.setEpsg(input.getEpsg()); + result.setDirectionAngle(input.getDirectionAngle()); + List listprojects = result.getProjects(); + for (long oid : input.getProjects()) { + listprojects.add((Project)session.get(StorePackage.eINSTANCE.getProject(), oid, OldQuery.getDefault())); } return result; } - public Set convertToSSetExtendedData(Collection input) { - Set result = new HashSet(); - for (ExtendedData o : input) { + public Set convertToSSetCheckout(Collection input) { + Set result = new HashSet(); + for (Checkout o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetExtendedData(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SExtendedData o : input) { + public Set convertFromSSetCheckout(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SCheckout o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListExtendedData(Collection input) { - List result = new ArrayList(); - for (ExtendedData o : input) { + public List convertToSListCheckout(Collection input) { + List result = new ArrayList(); + for (Checkout o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListExtendedData(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SExtendedData o : input) { + public List convertFromSListCheckout(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SCheckout o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SExtendedData convertToSObject(ExtendedData input) { + public SCheckout convertToSObject(Checkout input) { if (input == null) { return null; } - SExtendedData result = new SExtendedData(); + SCheckout result = new SCheckout(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setUrl(input.getUrl()); - result.setSize(input.getSize()); - result.setTitle(input.getTitle()); - result.setAdded(input.getAdded()); - File fileVal = input.getFile(); - result.setFileId(fileVal == null ? -1 : fileVal.getOid()); + result.setDate(input.getDate()); + result.setActive(input.getActive()); User userVal = input.getUser(); result.setUserId(userVal == null ? -1 : userVal.getOid()); - ExtendedDataSchema schemaVal = input.getSchema(); - result.setSchemaId(schemaVal == null ? -1 : schemaVal.getOid()); Revision revisionVal = input.getRevision(); - result.setRevisionId(revisionVal == null ? -1 : revisionVal.getOid()); + result.setRevision(convertToSObject(revisionVal)); Project projectVal = input.getProject(); result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); + Revision checkinVal = input.getCheckin(); + result.setCheckin(convertToSObject(checkinVal)); + List listlogs = new ArrayList(); + for (CheckoutRelated v : input.getLogs()) { + listlogs.add(v.getOid()); + } + result.setLogs(listlogs); return result; } - public ExtendedData convertFromSObject(SExtendedData input, DatabaseSession session) throws BimserverDatabaseException { + public Checkout convertFromSObject(SCheckout input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ExtendedData result = convertFromSObject(input, StoreFactory.eINSTANCE.createExtendedData(), session); + Checkout result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckout(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -4068,85 +3960,115 @@ public ExtendedData convertFromSObject(SExtendedData input, DatabaseSession sess return result; } - public ExtendedData convertFromSObject(SExtendedData input) throws BimserverDatabaseException { - ExtendedData result = convertFromSObject(input, StoreFactory.eINSTANCE.createExtendedData(), null); + public Checkout convertFromSObject(SCheckout input) throws BimserverDatabaseException { + Checkout result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckout(), null); return result; } - public ExtendedData convertFromSObject(SExtendedData input, ExtendedData result, DatabaseSession session) throws BimserverDatabaseException { + public Checkout convertFromSObject(SCheckout input, Checkout result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setUrl(input.getUrl()); - result.setSize(input.getSize()); - result.setTitle(input.getTitle()); - result.setAdded(input.getAdded()); - result.setFile((File)session.get(StorePackage.eINSTANCE.getFile(), input.getFileId(), OldQuery.getDefault())); + result.setDate(input.getDate()); + result.setActive(input.getActive()); result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); - result.setSchema((ExtendedDataSchema)session.get(StorePackage.eINSTANCE.getExtendedDataSchema(), input.getSchemaId(), OldQuery.getDefault())); - result.setRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getRevisionId(), OldQuery.getDefault())); + result.setRevision(convertFromSObject(input.getRevision(), session)); result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); + result.setCheckin(convertFromSObject(input.getCheckin(), session)); + List listlogs = result.getLogs(); + for (long oid : input.getLogs()) { + listlogs.add((CheckoutRelated)session.get(LogPackage.eINSTANCE.getCheckoutRelated(), oid, OldQuery.getDefault())); + } return result; } - public Set convertToSSetQueryEnginePluginConfiguration(Collection input) { - Set result = new HashSet(); - for (QueryEnginePluginConfiguration o : input) { + public Set convertToSSetServerSettings(Collection input) { + Set result = new HashSet(); + for (ServerSettings o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetQueryEnginePluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SQueryEnginePluginConfiguration o : input) { + public Set convertFromSSetServerSettings(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SServerSettings o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListQueryEnginePluginConfiguration(Collection input) { - List result = new ArrayList(); - for (QueryEnginePluginConfiguration o : input) { + public List convertToSListServerSettings(Collection input) { + List result = new ArrayList(); + for (ServerSettings o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListQueryEnginePluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SQueryEnginePluginConfiguration o : input) { + public List convertFromSListServerSettings(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SServerSettings o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SQueryEnginePluginConfiguration convertToSObject(QueryEnginePluginConfiguration input) { + public SServerSettings convertToSObject(ServerSettings input) { if (input == null) { return null; } - SQueryEnginePluginConfiguration result = new SQueryEnginePluginConfiguration(); + SServerSettings result = new SServerSettings(); result.setOid(input.getOid()); result.setRid(input.getRid()); + result.setSendConfirmationEmailAfterRegistration(input.isSendConfirmationEmailAfterRegistration()); + result.setAllowSelfRegistration(input.getAllowSelfRegistration()); + result.setAllowUsersToCreateTopLevelProjects(input.isAllowUsersToCreateTopLevelProjects()); + result.setCheckinMergingEnabled(input.getCheckinMergingEnabled()); + result.setSmtpServer(input.getSmtpServer()); + result.setEmailSenderAddress(input.getEmailSenderAddress()); + result.setEmailSenderName(input.getEmailSenderName()); + result.setSiteAddress(input.getSiteAddress()); + result.setGenerateGeometryOnCheckin(input.isGenerateGeometryOnCheckin()); + result.setAllowOnlyWhitelisted(input.isAllowOnlyWhitelisted()); + result.getWhitelistedDomains().addAll(input.getWhitelistedDomains()); + result.setHideUserListForNonAdmin(input.getHideUserListForNonAdmin()); + result.setProtocolBuffersPort(input.getProtocolBuffersPort()); + result.setCacheOutputFiles(input.getCacheOutputFiles()); + result.setServiceRepositoryUrl(input.getServiceRepositoryUrl()); + result.setSendEmailOnNewRevision(input.isSendEmailOnNewRevision()); + result.setSessionTimeOutSeconds(input.getSessionTimeOutSeconds()); + result.setSmtpUsername(input.getSmtpUsername()); + result.setSmtpPassword(input.getSmtpPassword()); + result.setSmtpPort(input.getSmtpPort()); + result.setSmtpProtocol(SSmtpProtocol.values()[input.getSmtpProtocol().ordinal()]); + result.setReuseGeometry(input.isReuseGeometry()); + result.setAllowCreateValidatedUser(input.isAllowCreateValidatedUser()); + result.setRenderEngineProcesses(input.getRenderEngineProcesses()); + result.setPluginStrictVersionChecking(input.isPluginStrictVersionChecking()); result.setName(input.getName()); - result.setEnabled(input.getEnabled()); result.setDescription(input.getDescription()); - PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor(); - result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid()); - ObjectType settingsVal = input.getSettings(); - result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid()); - UserSettings userSettingsVal = input.getUserSettings(); - result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid()); + result.setIcon(input.getIcon()); + result.setStoreLastLogin(input.isStoreLastLogin()); + result.setStoreServiceRuns(input.isStoreServiceRuns()); + result.setOptimizeMappedItems(input.isOptimizeMappedItems()); + List listwebModules = new ArrayList(); + for (WebModulePluginConfiguration v : input.getWebModules()) { + listwebModules.add(v.getOid()); + } + result.setWebModules(listwebModules); + WebModulePluginConfiguration webModuleVal = input.getWebModule(); + result.setWebModuleId(webModuleVal == null ? -1 : webModuleVal.getOid()); return result; } - public QueryEnginePluginConfiguration convertFromSObject(SQueryEnginePluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException { + public ServerSettings convertFromSObject(SServerSettings input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - QueryEnginePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createQueryEnginePluginConfiguration(), session); + ServerSettings result = convertFromSObject(input, StoreFactory.eINSTANCE.createServerSettings(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -4154,82 +4076,155 @@ public QueryEnginePluginConfiguration convertFromSObject(SQueryEnginePluginConfi return result; } - public QueryEnginePluginConfiguration convertFromSObject(SQueryEnginePluginConfiguration input) throws BimserverDatabaseException { - QueryEnginePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createQueryEnginePluginConfiguration(), null); + public ServerSettings convertFromSObject(SServerSettings input) throws BimserverDatabaseException { + ServerSettings result = convertFromSObject(input, StoreFactory.eINSTANCE.createServerSettings(), null); return result; } - public QueryEnginePluginConfiguration convertFromSObject(SQueryEnginePluginConfiguration input, QueryEnginePluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException { + public ServerSettings convertFromSObject(SServerSettings input, ServerSettings result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } + result.setSendConfirmationEmailAfterRegistration(input.isSendConfirmationEmailAfterRegistration()); + result.setAllowSelfRegistration(input.getAllowSelfRegistration()); + result.setAllowUsersToCreateTopLevelProjects(input.isAllowUsersToCreateTopLevelProjects()); + result.setCheckinMergingEnabled(input.getCheckinMergingEnabled()); + result.setSmtpServer(input.getSmtpServer()); + result.setEmailSenderAddress(input.getEmailSenderAddress()); + result.setEmailSenderName(input.getEmailSenderName()); + result.setSiteAddress(input.getSiteAddress()); + result.setGenerateGeometryOnCheckin(input.isGenerateGeometryOnCheckin()); + result.setAllowOnlyWhitelisted(input.isAllowOnlyWhitelisted()); + result.getWhitelistedDomains().addAll(input.getWhitelistedDomains()); + result.setHideUserListForNonAdmin(input.getHideUserListForNonAdmin()); + result.setProtocolBuffersPort(input.getProtocolBuffersPort()); + result.setCacheOutputFiles(input.getCacheOutputFiles()); + result.setServiceRepositoryUrl(input.getServiceRepositoryUrl()); + result.setSendEmailOnNewRevision(input.isSendEmailOnNewRevision()); + result.setSessionTimeOutSeconds(input.getSessionTimeOutSeconds()); + result.setSmtpUsername(input.getSmtpUsername()); + result.setSmtpPassword(input.getSmtpPassword()); + result.setSmtpPort(input.getSmtpPort()); + result.setSmtpProtocol(SmtpProtocol.values()[input.getSmtpProtocol().ordinal()]); + result.setReuseGeometry(input.isReuseGeometry()); + result.setAllowCreateValidatedUser(input.isAllowCreateValidatedUser()); + result.setRenderEngineProcesses(input.getRenderEngineProcesses()); + result.setPluginStrictVersionChecking(input.isPluginStrictVersionChecking()); result.setName(input.getName()); - result.setEnabled(input.getEnabled()); result.setDescription(input.getDescription()); - result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault())); - result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault())); - result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault())); + result.setIcon(input.getIcon()); + result.setStoreLastLogin(input.isStoreLastLogin()); + result.setStoreServiceRuns(input.isStoreServiceRuns()); + result.setOptimizeMappedItems(input.isOptimizeMappedItems()); + List listwebModules = result.getWebModules(); + for (long oid : input.getWebModules()) { + listwebModules.add((WebModulePluginConfiguration)session.get(StorePackage.eINSTANCE.getWebModulePluginConfiguration(), oid, OldQuery.getDefault())); + } + result.setWebModule((WebModulePluginConfiguration)session.get(StorePackage.eINSTANCE.getWebModulePluginConfiguration(), input.getWebModuleId(), OldQuery.getDefault())); return result; } - public Set convertToSSetWebModulePluginConfiguration(Collection input) { - Set result = new HashSet(); - for (WebModulePluginConfiguration o : input) { + public Set convertToSSetUserSettings(Collection input) { + Set result = new HashSet(); + for (UserSettings o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetWebModulePluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SWebModulePluginConfiguration o : input) { + public Set convertFromSSetUserSettings(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SUserSettings o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListWebModulePluginConfiguration(Collection input) { - List result = new ArrayList(); - for (WebModulePluginConfiguration o : input) { + public List convertToSListUserSettings(Collection input) { + List result = new ArrayList(); + for (UserSettings o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListWebModulePluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SWebModulePluginConfiguration o : input) { + public List convertFromSListUserSettings(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SUserSettings o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SWebModulePluginConfiguration convertToSObject(WebModulePluginConfiguration input) { + public SUserSettings convertToSObject(UserSettings input) { if (input == null) { return null; } - - SWebModulePluginConfiguration result = new SWebModulePluginConfiguration(); - result.setOid(input.getOid()); - result.setRid(input.getRid()); - result.setName(input.getName()); - result.setEnabled(input.getEnabled()); - result.setDescription(input.getDescription()); - PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor(); - result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid()); - ObjectType settingsVal = input.getSettings(); - result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid()); - ServerSettings serverSettingsVal = input.getServerSettings(); - result.setServerSettingsId(serverSettingsVal == null ? -1 : serverSettingsVal.getOid()); + + SUserSettings result = new SUserSettings(); + result.setOid(input.getOid()); + result.setRid(input.getRid()); + List listserializers = new ArrayList(); + for (SerializerPluginConfiguration v : input.getSerializers()) { + listserializers.add(v.getOid()); + } + result.setSerializers(listserializers); + List listobjectIDMs = new ArrayList(); + for (ObjectIDMPluginConfiguration v : input.getObjectIDMs()) { + listobjectIDMs.add(v.getOid()); + } + result.setObjectIDMs(listobjectIDMs); + List listrenderEngines = new ArrayList(); + for (RenderEnginePluginConfiguration v : input.getRenderEngines()) { + listrenderEngines.add(v.getOid()); + } + result.setRenderEngines(listrenderEngines); + List listdeserializers = new ArrayList(); + for (DeserializerPluginConfiguration v : input.getDeserializers()) { + listdeserializers.add(v.getOid()); + } + result.setDeserializers(listdeserializers); + List listqueryEngines = new ArrayList(); + for (QueryEnginePluginConfiguration v : input.getQueryEngines()) { + listqueryEngines.add(v.getOid()); + } + result.setQueryEngines(listqueryEngines); + List listmodelMergers = new ArrayList(); + for (ModelMergerPluginConfiguration v : input.getModelMergers()) { + listmodelMergers.add(v.getOid()); + } + result.setModelMergers(listmodelMergers); + List listmodelCompares = new ArrayList(); + for (ModelComparePluginConfiguration v : input.getModelCompares()) { + listmodelCompares.add(v.getOid()); + } + result.setModelCompares(listmodelCompares); + ModelMergerPluginConfiguration defaultModelMergerVal = input.getDefaultModelMerger(); + result.setDefaultModelMergerId(defaultModelMergerVal == null ? -1 : defaultModelMergerVal.getOid()); + ModelComparePluginConfiguration defaultModelCompareVal = input.getDefaultModelCompare(); + result.setDefaultModelCompareId(defaultModelCompareVal == null ? -1 : defaultModelCompareVal.getOid()); + QueryEnginePluginConfiguration defaultQueryEngineVal = input.getDefaultQueryEngine(); + result.setDefaultQueryEngineId(defaultQueryEngineVal == null ? -1 : defaultQueryEngineVal.getOid()); + RenderEnginePluginConfiguration defaultRenderEngineVal = input.getDefaultRenderEngine(); + result.setDefaultRenderEngineId(defaultRenderEngineVal == null ? -1 : defaultRenderEngineVal.getOid()); + SerializerPluginConfiguration defaultSerializerVal = input.getDefaultSerializer(); + result.setDefaultSerializerId(defaultSerializerVal == null ? -1 : defaultSerializerVal.getOid()); + ObjectIDMPluginConfiguration defaultObjectIDMVal = input.getDefaultObjectIDM(); + result.setDefaultObjectIDMId(defaultObjectIDMVal == null ? -1 : defaultObjectIDMVal.getOid()); + List listservices = new ArrayList(); + for (InternalServicePluginConfiguration v : input.getServices()) { + listservices.add(v.getOid()); + } + result.setServices(listservices); return result; } - public WebModulePluginConfiguration convertFromSObject(SWebModulePluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException { + public UserSettings convertFromSObject(SUserSettings input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - WebModulePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createWebModulePluginConfiguration(), session); + UserSettings result = convertFromSObject(input, StoreFactory.eINSTANCE.createUserSettings(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -4237,62 +4232,121 @@ public WebModulePluginConfiguration convertFromSObject(SWebModulePluginConfigura return result; } - public WebModulePluginConfiguration convertFromSObject(SWebModulePluginConfiguration input) throws BimserverDatabaseException { - WebModulePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createWebModulePluginConfiguration(), null); + public UserSettings convertFromSObject(SUserSettings input) throws BimserverDatabaseException { + UserSettings result = convertFromSObject(input, StoreFactory.eINSTANCE.createUserSettings(), null); return result; } - public WebModulePluginConfiguration convertFromSObject(SWebModulePluginConfiguration input, WebModulePluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException { + public UserSettings convertFromSObject(SUserSettings input, UserSettings result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setName(input.getName()); - result.setEnabled(input.getEnabled()); - result.setDescription(input.getDescription()); - result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault())); - result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault())); - result.setServerSettings((ServerSettings)session.get(StorePackage.eINSTANCE.getServerSettings(), input.getServerSettingsId(), OldQuery.getDefault())); + List listserializers = result.getSerializers(); + for (long oid : input.getSerializers()) { + listserializers.add((SerializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getSerializerPluginConfiguration(), oid, OldQuery.getDefault())); + } + List listobjectIDMs = result.getObjectIDMs(); + for (long oid : input.getObjectIDMs()) { + listobjectIDMs.add((ObjectIDMPluginConfiguration)session.get(StorePackage.eINSTANCE.getObjectIDMPluginConfiguration(), oid, OldQuery.getDefault())); + } + List listrenderEngines = result.getRenderEngines(); + for (long oid : input.getRenderEngines()) { + listrenderEngines.add((RenderEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getRenderEnginePluginConfiguration(), oid, OldQuery.getDefault())); + } + List listdeserializers = result.getDeserializers(); + for (long oid : input.getDeserializers()) { + listdeserializers.add((DeserializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getDeserializerPluginConfiguration(), oid, OldQuery.getDefault())); + } + List listqueryEngines = result.getQueryEngines(); + for (long oid : input.getQueryEngines()) { + listqueryEngines.add((QueryEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getQueryEnginePluginConfiguration(), oid, OldQuery.getDefault())); + } + List listmodelMergers = result.getModelMergers(); + for (long oid : input.getModelMergers()) { + listmodelMergers.add((ModelMergerPluginConfiguration)session.get(StorePackage.eINSTANCE.getModelMergerPluginConfiguration(), oid, OldQuery.getDefault())); + } + List listmodelCompares = result.getModelCompares(); + for (long oid : input.getModelCompares()) { + listmodelCompares.add((ModelComparePluginConfiguration)session.get(StorePackage.eINSTANCE.getModelComparePluginConfiguration(), oid, OldQuery.getDefault())); + } + result.setDefaultModelMerger((ModelMergerPluginConfiguration)session.get(StorePackage.eINSTANCE.getModelMergerPluginConfiguration(), input.getDefaultModelMergerId(), OldQuery.getDefault())); + result.setDefaultModelCompare((ModelComparePluginConfiguration)session.get(StorePackage.eINSTANCE.getModelComparePluginConfiguration(), input.getDefaultModelCompareId(), OldQuery.getDefault())); + result.setDefaultQueryEngine((QueryEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getQueryEnginePluginConfiguration(), input.getDefaultQueryEngineId(), OldQuery.getDefault())); + result.setDefaultRenderEngine((RenderEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getRenderEnginePluginConfiguration(), input.getDefaultRenderEngineId(), OldQuery.getDefault())); + result.setDefaultSerializer((SerializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getSerializerPluginConfiguration(), input.getDefaultSerializerId(), OldQuery.getDefault())); + result.setDefaultObjectIDM((ObjectIDMPluginConfiguration)session.get(StorePackage.eINSTANCE.getObjectIDMPluginConfiguration(), input.getDefaultObjectIDMId(), OldQuery.getDefault())); + List listservices = result.getServices(); + for (long oid : input.getServices()) { + listservices.add((InternalServicePluginConfiguration)session.get(StorePackage.eINSTANCE.getInternalServicePluginConfiguration(), oid, OldQuery.getDefault())); + } return result; } - public Set convertToSSetModelMergerPluginConfiguration(Collection input) { - Set result = new HashSet(); - for (ModelMergerPluginConfiguration o : input) { + public Set convertToSSetPluginConfiguration(Collection input) { + Set result = new HashSet(); + for (PluginConfiguration o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetModelMergerPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SModelMergerPluginConfiguration o : input) { + public Set convertFromSSetPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SPluginConfiguration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListModelMergerPluginConfiguration(Collection input) { - List result = new ArrayList(); - for (ModelMergerPluginConfiguration o : input) { + public List convertToSListPluginConfiguration(Collection input) { + List result = new ArrayList(); + for (PluginConfiguration o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListModelMergerPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SModelMergerPluginConfiguration o : input) { + public List convertFromSListPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SPluginConfiguration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SModelMergerPluginConfiguration convertToSObject(ModelMergerPluginConfiguration input) { + public SPluginConfiguration convertToSObject(PluginConfiguration input) { if (input == null) { return null; } - SModelMergerPluginConfiguration result = new SModelMergerPluginConfiguration(); + if (input instanceof WebModulePluginConfiguration) { + return convertToSObject((WebModulePluginConfiguration)input); + } + else if (input instanceof ModelMergerPluginConfiguration) { + return convertToSObject((ModelMergerPluginConfiguration)input); + } + else if (input instanceof ModelComparePluginConfiguration) { + return convertToSObject((ModelComparePluginConfiguration)input); + } + else if (input instanceof RenderEnginePluginConfiguration) { + return convertToSObject((RenderEnginePluginConfiguration)input); + } + else if (input instanceof ObjectIDMPluginConfiguration) { + return convertToSObject((ObjectIDMPluginConfiguration)input); + } + else if (input instanceof QueryEnginePluginConfiguration) { + return convertToSObject((QueryEnginePluginConfiguration)input); + } + else if (input instanceof InternalServicePluginConfiguration) { + return convertToSObject((InternalServicePluginConfiguration)input); + } + else if (input instanceof SerializerPluginConfiguration) { + return convertToSObject((SerializerPluginConfiguration)input); + } + else if (input instanceof DeserializerPluginConfiguration) { + return convertToSObject((DeserializerPluginConfiguration)input); + } + SPluginConfiguration result = new SPluginConfiguration(); result.setOid(input.getOid()); result.setRid(input.getRid()); result.setName(input.getName()); @@ -4302,17 +4356,15 @@ public SModelMergerPluginConfiguration convertToSObject(ModelMergerPluginConfigu result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid()); ObjectType settingsVal = input.getSettings(); result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid()); - UserSettings userSettingsVal = input.getUserSettings(); - result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid()); return result; } - public ModelMergerPluginConfiguration convertFromSObject(SModelMergerPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException { + public PluginConfiguration convertFromSObject(SPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ModelMergerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelMergerPluginConfiguration(), session); + PluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginConfiguration(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -4320,82 +4372,116 @@ public ModelMergerPluginConfiguration convertFromSObject(SModelMergerPluginConfi return result; } - public ModelMergerPluginConfiguration convertFromSObject(SModelMergerPluginConfiguration input) throws BimserverDatabaseException { - ModelMergerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelMergerPluginConfiguration(), null); + public PluginConfiguration convertFromSObject(SPluginConfiguration input) throws BimserverDatabaseException { + PluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginConfiguration(), null); return result; } - public ModelMergerPluginConfiguration convertFromSObject(SModelMergerPluginConfiguration input, ModelMergerPluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException { + public PluginConfiguration convertFromSObject(SPluginConfiguration input, PluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } + if (input instanceof SWebModulePluginConfiguration) { + return convertFromSObject((SWebModulePluginConfiguration)input, session); + } + else if (input instanceof SModelMergerPluginConfiguration) { + return convertFromSObject((SModelMergerPluginConfiguration)input, session); + } + else if (input instanceof SModelComparePluginConfiguration) { + return convertFromSObject((SModelComparePluginConfiguration)input, session); + } + else if (input instanceof SRenderEnginePluginConfiguration) { + return convertFromSObject((SRenderEnginePluginConfiguration)input, session); + } + else if (input instanceof SObjectIDMPluginConfiguration) { + return convertFromSObject((SObjectIDMPluginConfiguration)input, session); + } + else if (input instanceof SQueryEnginePluginConfiguration) { + return convertFromSObject((SQueryEnginePluginConfiguration)input, session); + } + else if (input instanceof SInternalServicePluginConfiguration) { + return convertFromSObject((SInternalServicePluginConfiguration)input, session); + } + else if (input instanceof SSerializerPluginConfiguration) { + return convertFromSObject((SSerializerPluginConfiguration)input, session); + } + else if (input instanceof SDeserializerPluginConfiguration) { + return convertFromSObject((SDeserializerPluginConfiguration)input, session); + } result.setName(input.getName()); result.setEnabled(input.getEnabled()); result.setDescription(input.getDescription()); result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault())); result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault())); - result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault())); return result; } - public Set convertToSSetModelComparePluginConfiguration(Collection input) { - Set result = new HashSet(); - for (ModelComparePluginConfiguration o : input) { + public Set convertToSSetSerializerPluginConfiguration(Collection input) { + Set result = new HashSet(); + for (SerializerPluginConfiguration o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetModelComparePluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SModelComparePluginConfiguration o : input) { + public Set convertFromSSetSerializerPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SSerializerPluginConfiguration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListModelComparePluginConfiguration(Collection input) { - List result = new ArrayList(); - for (ModelComparePluginConfiguration o : input) { + public List convertToSListSerializerPluginConfiguration(Collection input) { + List result = new ArrayList(); + for (SerializerPluginConfiguration o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListModelComparePluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SModelComparePluginConfiguration o : input) { + public List convertFromSListSerializerPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SSerializerPluginConfiguration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SModelComparePluginConfiguration convertToSObject(ModelComparePluginConfiguration input) { + public SSerializerPluginConfiguration convertToSObject(SerializerPluginConfiguration input) { if (input == null) { return null; } - SModelComparePluginConfiguration result = new SModelComparePluginConfiguration(); + if (input instanceof MessagingSerializerPluginConfiguration) { + return convertToSObject((MessagingSerializerPluginConfiguration)input); + } + SSerializerPluginConfiguration result = new SSerializerPluginConfiguration(); result.setOid(input.getOid()); result.setRid(input.getRid()); result.setName(input.getName()); result.setEnabled(input.getEnabled()); result.setDescription(input.getDescription()); + result.setStreaming(input.isStreaming()); PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor(); result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid()); ObjectType settingsVal = input.getSettings(); result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid()); + ObjectIDMPluginConfiguration objectIDMVal = input.getObjectIDM(); + result.setObjectIDMId(objectIDMVal == null ? -1 : objectIDMVal.getOid()); UserSettings userSettingsVal = input.getUserSettings(); result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid()); + RenderEnginePluginConfiguration renderEngineVal = input.getRenderEngine(); + result.setRenderEngineId(renderEngineVal == null ? -1 : renderEngineVal.getOid()); return result; } - public ModelComparePluginConfiguration convertFromSObject(SModelComparePluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException { + public SerializerPluginConfiguration convertFromSObject(SSerializerPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ModelComparePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelComparePluginConfiguration(), session); + SerializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createSerializerPluginConfiguration(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -4403,279 +4489,272 @@ public ModelComparePluginConfiguration convertFromSObject(SModelComparePluginCon return result; } - public ModelComparePluginConfiguration convertFromSObject(SModelComparePluginConfiguration input) throws BimserverDatabaseException { - ModelComparePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelComparePluginConfiguration(), null); + public SerializerPluginConfiguration convertFromSObject(SSerializerPluginConfiguration input) throws BimserverDatabaseException { + SerializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createSerializerPluginConfiguration(), null); return result; } - public ModelComparePluginConfiguration convertFromSObject(SModelComparePluginConfiguration input, ModelComparePluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException { + public SerializerPluginConfiguration convertFromSObject(SSerializerPluginConfiguration input, SerializerPluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } + if (input instanceof SMessagingSerializerPluginConfiguration) { + return convertFromSObject((SMessagingSerializerPluginConfiguration)input, session); + } result.setName(input.getName()); result.setEnabled(input.getEnabled()); result.setDescription(input.getDescription()); + result.setStreaming(input.isStreaming()); result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault())); result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault())); + result.setObjectIDM((ObjectIDMPluginConfiguration)session.get(StorePackage.eINSTANCE.getObjectIDMPluginConfiguration(), input.getObjectIDMId(), OldQuery.getDefault())); result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault())); + result.setRenderEngine((RenderEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getRenderEnginePluginConfiguration(), input.getRenderEngineId(), OldQuery.getDefault())); return result; } - public STrigger convertToSObject(Trigger input) { - return STrigger.values()[input.ordinal()]; - } - - public Trigger convertFromSObject(STrigger input) { - return Trigger.values()[input.ordinal()]; - } - public Set convertToSSetProfileDescriptor(Collection input) { - Set result = new HashSet(); - for (ProfileDescriptor o : input) { + public Set convertToSSetObjectIDMPluginConfiguration(Collection input) { + Set result = new HashSet(); + for (ObjectIDMPluginConfiguration o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetProfileDescriptor(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SProfileDescriptor o : input) { + public Set convertFromSSetObjectIDMPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SObjectIDMPluginConfiguration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListProfileDescriptor(Collection input) { - List result = new ArrayList(); - for (ProfileDescriptor o : input) { + public List convertToSListObjectIDMPluginConfiguration(Collection input) { + List result = new ArrayList(); + for (ObjectIDMPluginConfiguration o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListProfileDescriptor(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SProfileDescriptor o : input) { + public List convertFromSListObjectIDMPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SObjectIDMPluginConfiguration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SProfileDescriptor convertToSObject(ProfileDescriptor input) { + public SObjectIDMPluginConfiguration convertToSObject(ObjectIDMPluginConfiguration input) { if (input == null) { return null; } - SProfileDescriptor result = new SProfileDescriptor(); + SObjectIDMPluginConfiguration result = new SObjectIDMPluginConfiguration(); + result.setOid(input.getOid()); + result.setRid(input.getRid()); result.setName(input.getName()); + result.setEnabled(input.getEnabled()); result.setDescription(input.getDescription()); - result.setPublicProfile(input.isPublicProfile()); - result.setIdentifier(input.getIdentifier()); + PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor(); + result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid()); + ObjectType settingsVal = input.getSettings(); + result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid()); + List listserializers = new ArrayList(); + for (SerializerPluginConfiguration v : input.getSerializers()) { + listserializers.add(v.getOid()); + } + result.setSerializers(listserializers); + UserSettings userSettingsVal = input.getUserSettings(); + result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid()); return result; } - public ProfileDescriptor convertFromSObject(SProfileDescriptor input, DatabaseSession session) throws BimserverDatabaseException { + public ObjectIDMPluginConfiguration convertFromSObject(SObjectIDMPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ProfileDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createProfileDescriptor(), session); + ObjectIDMPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectIDMPluginConfiguration(), session); + + ((IdEObjectImpl)result).setOid(input.getOid()); + ((IdEObjectImpl)result).setRid(input.getRid()); return result; } - public ProfileDescriptor convertFromSObject(SProfileDescriptor input) throws BimserverDatabaseException { - ProfileDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createProfileDescriptor(), null); + public ObjectIDMPluginConfiguration convertFromSObject(SObjectIDMPluginConfiguration input) throws BimserverDatabaseException { + ObjectIDMPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectIDMPluginConfiguration(), null); return result; } - public ProfileDescriptor convertFromSObject(SProfileDescriptor input, ProfileDescriptor result, DatabaseSession session) throws BimserverDatabaseException { + public ObjectIDMPluginConfiguration convertFromSObject(SObjectIDMPluginConfiguration input, ObjectIDMPluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } result.setName(input.getName()); + result.setEnabled(input.getEnabled()); result.setDescription(input.getDescription()); - result.setPublicProfile(input.isPublicProfile()); - result.setIdentifier(input.getIdentifier()); + result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault())); + result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault())); + List listserializers = result.getSerializers(); + for (long oid : input.getSerializers()) { + listserializers.add((SerializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getSerializerPluginConfiguration(), oid, OldQuery.getDefault())); + } + result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault())); return result; } - public Set convertToSSetServiceDescriptor(Collection input) { - Set result = new HashSet(); - for (ServiceDescriptor o : input) { + public Set convertToSSetRenderEnginePluginConfiguration(Collection input) { + Set result = new HashSet(); + for (RenderEnginePluginConfiguration o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetServiceDescriptor(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SServiceDescriptor o : input) { + public Set convertFromSSetRenderEnginePluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SRenderEnginePluginConfiguration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListServiceDescriptor(Collection input) { - List result = new ArrayList(); - for (ServiceDescriptor o : input) { + public List convertToSListRenderEnginePluginConfiguration(Collection input) { + List result = new ArrayList(); + for (RenderEnginePluginConfiguration o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListServiceDescriptor(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SServiceDescriptor o : input) { + public List convertFromSListRenderEnginePluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SRenderEnginePluginConfiguration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SServiceDescriptor convertToSObject(ServiceDescriptor input) { + public SRenderEnginePluginConfiguration convertToSObject(RenderEnginePluginConfiguration input) { if (input == null) { return null; } - SServiceDescriptor result = new SServiceDescriptor(); + SRenderEnginePluginConfiguration result = new SRenderEnginePluginConfiguration(); + result.setOid(input.getOid()); + result.setRid(input.getRid()); result.setName(input.getName()); - result.setUrl(input.getUrl()); - result.setToken(input.getToken()); - result.setIdentifier(input.getIdentifier()); - result.setNotificationProtocol(SAccessMethod.values()[input.getNotificationProtocol().ordinal()]); + result.setEnabled(input.getEnabled()); result.setDescription(input.getDescription()); - result.setTrigger(STrigger.values()[input.getTrigger().ordinal()]); - result.setReadRevision(input.isReadRevision()); - result.setReadExtendedData(input.getReadExtendedData()); - result.setWriteRevision(input.isWriteRevision()); - result.setWriteExtendedData(input.getWriteExtendedData()); - result.setProviderName(input.getProviderName()); - result.setCompanyUrl(input.getCompanyUrl()); - result.setTokenUrl(input.getTokenUrl()); - result.setNewProfileUrl(input.getNewProfileUrl()); - result.setRegisterUrl(input.getRegisterUrl()); - result.setAuthorizeUrl(input.getAuthorizeUrl()); + PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor(); + result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid()); + ObjectType settingsVal = input.getSettings(); + result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid()); + List listserializers = new ArrayList(); + for (SerializerPluginConfiguration v : input.getSerializers()) { + listserializers.add(v.getOid()); + } + result.setSerializers(listserializers); + UserSettings userSettingsVal = input.getUserSettings(); + result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid()); return result; } - public ServiceDescriptor convertFromSObject(SServiceDescriptor input, DatabaseSession session) throws BimserverDatabaseException { + public RenderEnginePluginConfiguration convertFromSObject(SRenderEnginePluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ServiceDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceDescriptor(), session); + RenderEnginePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createRenderEnginePluginConfiguration(), session); + + ((IdEObjectImpl)result).setOid(input.getOid()); + ((IdEObjectImpl)result).setRid(input.getRid()); return result; } - public ServiceDescriptor convertFromSObject(SServiceDescriptor input) throws BimserverDatabaseException { - ServiceDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceDescriptor(), null); + public RenderEnginePluginConfiguration convertFromSObject(SRenderEnginePluginConfiguration input) throws BimserverDatabaseException { + RenderEnginePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createRenderEnginePluginConfiguration(), null); return result; } - public ServiceDescriptor convertFromSObject(SServiceDescriptor input, ServiceDescriptor result, DatabaseSession session) throws BimserverDatabaseException { + public RenderEnginePluginConfiguration convertFromSObject(SRenderEnginePluginConfiguration input, RenderEnginePluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } result.setName(input.getName()); - result.setUrl(input.getUrl()); - result.setToken(input.getToken()); - result.setIdentifier(input.getIdentifier()); - result.setNotificationProtocol(AccessMethod.values()[input.getNotificationProtocol().ordinal()]); + result.setEnabled(input.getEnabled()); result.setDescription(input.getDescription()); - result.setTrigger(Trigger.values()[input.getTrigger().ordinal()]); - result.setReadRevision(input.isReadRevision()); - result.setReadExtendedData(input.getReadExtendedData()); - result.setWriteRevision(input.isWriteRevision()); - result.setWriteExtendedData(input.getWriteExtendedData()); - result.setProviderName(input.getProviderName()); - result.setCompanyUrl(input.getCompanyUrl()); - result.setTokenUrl(input.getTokenUrl()); - result.setNewProfileUrl(input.getNewProfileUrl()); - result.setRegisterUrl(input.getRegisterUrl()); - result.setAuthorizeUrl(input.getAuthorizeUrl()); + result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault())); + result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault())); + List listserializers = result.getSerializers(); + for (long oid : input.getSerializers()) { + listserializers.add((SerializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getSerializerPluginConfiguration(), oid, OldQuery.getDefault())); + } + result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault())); return result; } - public Set convertToSSetService(Collection input) { - Set result = new HashSet(); - for (Service o : input) { + public Set convertToSSetDeserializerPluginConfiguration(Collection input) { + Set result = new HashSet(); + for (DeserializerPluginConfiguration o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetService(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SService o : input) { + public Set convertFromSSetDeserializerPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SDeserializerPluginConfiguration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListService(Collection input) { - List result = new ArrayList(); - for (Service o : input) { + public List convertToSListDeserializerPluginConfiguration(Collection input) { + List result = new ArrayList(); + for (DeserializerPluginConfiguration o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListService(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SService o : input) { + public List convertFromSListDeserializerPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SDeserializerPluginConfiguration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SService convertToSObject(Service input) { + public SDeserializerPluginConfiguration convertToSObject(DeserializerPluginConfiguration input) { if (input == null) { return null; } - SService result = new SService(); + SDeserializerPluginConfiguration result = new SDeserializerPluginConfiguration(); result.setOid(input.getOid()); result.setRid(input.getRid()); result.setName(input.getName()); - result.setServiceName(input.getServiceName()); - result.setServiceIdentifier(input.getServiceIdentifier()); - result.setProviderName(input.getProviderName()); - result.setUrl(input.getUrl()); - result.setToken(input.getToken()); - result.setNotificationProtocol(SAccessMethod.values()[input.getNotificationProtocol().ordinal()]); + result.setEnabled(input.getEnabled()); result.setDescription(input.getDescription()); - result.setTrigger(STrigger.values()[input.getTrigger().ordinal()]); - result.setReadRevision(input.isReadRevision()); - result.setProfileIdentifier(input.getProfileIdentifier()); - result.setProfileName(input.getProfileName()); - result.setProfileDescription(input.getProfileDescription()); - result.setProfilePublic(input.isProfilePublic()); - ExtendedDataSchema readExtendedDataVal = input.getReadExtendedData(); - result.setReadExtendedDataId(readExtendedDataVal == null ? -1 : readExtendedDataVal.getOid()); - Project writeRevisionVal = input.getWriteRevision(); - result.setWriteRevisionId(writeRevisionVal == null ? -1 : writeRevisionVal.getOid()); - ExtendedDataSchema writeExtendedDataVal = input.getWriteExtendedData(); - result.setWriteExtendedDataId(writeExtendedDataVal == null ? -1 : writeExtendedDataVal.getOid()); - Project projectVal = input.getProject(); - result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); - User userVal = input.getUser(); - result.setUserId(userVal == null ? -1 : userVal.getOid()); - InternalServicePluginConfiguration internalServiceVal = input.getInternalService(); - result.setInternalServiceId(internalServiceVal == null ? -1 : internalServiceVal.getOid()); - List listmodelCheckers = new ArrayList(); - for (ModelCheckerInstance v : input.getModelCheckers()) { - listmodelCheckers.add(v.getOid()); - } - result.setModelCheckers(listmodelCheckers); + PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor(); + result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid()); + ObjectType settingsVal = input.getSettings(); + result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid()); + UserSettings userSettingsVal = input.getUserSettings(); + result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid()); return result; } - public Service convertFromSObject(SService input, DatabaseSession session) throws BimserverDatabaseException { + public DeserializerPluginConfiguration convertFromSObject(SDeserializerPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - Service result = convertFromSObject(input, StoreFactory.eINSTANCE.createService(), session); + DeserializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createDeserializerPluginConfiguration(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -4683,93 +4762,80 @@ public Service convertFromSObject(SService input, DatabaseSession session) throw return result; } - public Service convertFromSObject(SService input) throws BimserverDatabaseException { - Service result = convertFromSObject(input, StoreFactory.eINSTANCE.createService(), null); + public DeserializerPluginConfiguration convertFromSObject(SDeserializerPluginConfiguration input) throws BimserverDatabaseException { + DeserializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createDeserializerPluginConfiguration(), null); return result; } - public Service convertFromSObject(SService input, Service result, DatabaseSession session) throws BimserverDatabaseException { + public DeserializerPluginConfiguration convertFromSObject(SDeserializerPluginConfiguration input, DeserializerPluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } result.setName(input.getName()); - result.setServiceName(input.getServiceName()); - result.setServiceIdentifier(input.getServiceIdentifier()); - result.setProviderName(input.getProviderName()); - result.setUrl(input.getUrl()); - result.setToken(input.getToken()); - result.setNotificationProtocol(AccessMethod.values()[input.getNotificationProtocol().ordinal()]); + result.setEnabled(input.getEnabled()); result.setDescription(input.getDescription()); - result.setTrigger(Trigger.values()[input.getTrigger().ordinal()]); - result.setReadRevision(input.isReadRevision()); - result.setProfileIdentifier(input.getProfileIdentifier()); - result.setProfileName(input.getProfileName()); - result.setProfileDescription(input.getProfileDescription()); - result.setProfilePublic(input.isProfilePublic()); - result.setReadExtendedData((ExtendedDataSchema)session.get(StorePackage.eINSTANCE.getExtendedDataSchema(), input.getReadExtendedDataId(), OldQuery.getDefault())); - result.setWriteRevision((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getWriteRevisionId(), OldQuery.getDefault())); - result.setWriteExtendedData((ExtendedDataSchema)session.get(StorePackage.eINSTANCE.getExtendedDataSchema(), input.getWriteExtendedDataId(), OldQuery.getDefault())); - result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); - result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); - result.setInternalService((InternalServicePluginConfiguration)session.get(StorePackage.eINSTANCE.getInternalServicePluginConfiguration(), input.getInternalServiceId(), OldQuery.getDefault())); - List listmodelCheckers = result.getModelCheckers(); - for (long oid : input.getModelCheckers()) { - listmodelCheckers.add((ModelCheckerInstance)session.get(StorePackage.eINSTANCE.getModelCheckerInstance(), oid, OldQuery.getDefault())); - } + result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault())); + result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault())); + result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault())); return result; } - public Set convertToSSetToken(Collection input) { - Set result = new HashSet(); - for (Token o : input) { + public Set convertToSSetDownloadResult(Collection input) { + Set result = new HashSet(); + for (DownloadResult o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetToken(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SToken o : input) { + public Set convertFromSSetDownloadResult(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SDownloadResult o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListToken(Collection input) { - List result = new ArrayList(); - for (Token o : input) { + public List convertToSListDownloadResult(Collection input) { + List result = new ArrayList(); + for (DownloadResult o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListToken(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SToken o : input) { + public List convertFromSListDownloadResult(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SDownloadResult o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SToken convertToSObject(Token input) { + public SDownloadResult convertToSObject(DownloadResult input) { if (input == null) { return null; } - SToken result = new SToken(); + if (input instanceof CheckoutResult) { + return convertToSObject((CheckoutResult)input); + } + SDownloadResult result = new SDownloadResult(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setTokenString(input.getTokenString()); - result.setExpires(input.getExpires()); + result.setProjectName(input.getProjectName()); + result.setRevisionNr(input.getRevisionNr()); + result.setFile(input.getFile()); + result.setSerializerOid(input.getSerializerOid()); return result; } - public Token convertFromSObject(SToken input, DatabaseSession session) throws BimserverDatabaseException { + public DownloadResult convertFromSObject(SDownloadResult input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - Token result = convertFromSObject(input, StoreFactory.eINSTANCE.createToken(), session); + DownloadResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createDownloadResult(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -4777,80 +4843,78 @@ public Token convertFromSObject(SToken input, DatabaseSession session) throws Bi return result; } - public Token convertFromSObject(SToken input) throws BimserverDatabaseException { - Token result = convertFromSObject(input, StoreFactory.eINSTANCE.createToken(), null); + public DownloadResult convertFromSObject(SDownloadResult input) throws BimserverDatabaseException { + DownloadResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createDownloadResult(), null); return result; } - public Token convertFromSObject(SToken input, Token result, DatabaseSession session) throws BimserverDatabaseException { + public DownloadResult convertFromSObject(SDownloadResult input, DownloadResult result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setTokenString(input.getTokenString()); - result.setExpires(input.getExpires()); + if (input instanceof SCheckoutResult) { + return convertFromSObject((SCheckoutResult)input, session); + } + result.setProjectName(input.getProjectName()); + result.setRevisionNr(input.getRevisionNr()); + result.setFile(input.getFile()); + result.setSerializerOid(input.getSerializerOid()); return result; } - public Set convertToSSetInternalServicePluginConfiguration(Collection input) { - Set result = new HashSet(); - for (InternalServicePluginConfiguration o : input) { + public Set convertToSSetCheckoutResult(Collection input) { + Set result = new HashSet(); + for (CheckoutResult o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetInternalServicePluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SInternalServicePluginConfiguration o : input) { + public Set convertFromSSetCheckoutResult(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SCheckoutResult o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListInternalServicePluginConfiguration(Collection input) { - List result = new ArrayList(); - for (InternalServicePluginConfiguration o : input) { + public List convertToSListCheckoutResult(Collection input) { + List result = new ArrayList(); + for (CheckoutResult o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListInternalServicePluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SInternalServicePluginConfiguration o : input) { + public List convertFromSListCheckoutResult(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SCheckoutResult o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SInternalServicePluginConfiguration convertToSObject(InternalServicePluginConfiguration input) { + public SCheckoutResult convertToSObject(CheckoutResult input) { if (input == null) { return null; } - SInternalServicePluginConfiguration result = new SInternalServicePluginConfiguration(); + SCheckoutResult result = new SCheckoutResult(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setName(input.getName()); - result.setEnabled(input.getEnabled()); - result.setDescription(input.getDescription()); - result.setRemoteAccessible(input.isRemoteAccessible()); - result.setPublicProfile(input.isPublicProfile()); - PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor(); - result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid()); - ObjectType settingsVal = input.getSettings(); - result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid()); - UserSettings userSettingsVal = input.getUserSettings(); - result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid()); + result.setProjectName(input.getProjectName()); + result.setRevisionNr(input.getRevisionNr()); + result.setFile(input.getFile()); + result.setSerializerOid(input.getSerializerOid()); return result; } - public InternalServicePluginConfiguration convertFromSObject(SInternalServicePluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException { + public CheckoutResult convertFromSObject(SCheckoutResult input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - InternalServicePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createInternalServicePluginConfiguration(), session); + CheckoutResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckoutResult(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -4858,301 +4922,330 @@ public InternalServicePluginConfiguration convertFromSObject(SInternalServicePlu return result; } - public InternalServicePluginConfiguration convertFromSObject(SInternalServicePluginConfiguration input) throws BimserverDatabaseException { - InternalServicePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createInternalServicePluginConfiguration(), null); + public CheckoutResult convertFromSObject(SCheckoutResult input) throws BimserverDatabaseException { + CheckoutResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckoutResult(), null); return result; } - public InternalServicePluginConfiguration convertFromSObject(SInternalServicePluginConfiguration input, InternalServicePluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException { + public CheckoutResult convertFromSObject(SCheckoutResult input, CheckoutResult result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setName(input.getName()); - result.setEnabled(input.getEnabled()); - result.setDescription(input.getDescription()); - result.setRemoteAccessible(input.isRemoteAccessible()); - result.setPublicProfile(input.isPublicProfile()); - result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault())); - result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault())); - result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault())); + result.setProjectName(input.getProjectName()); + result.setRevisionNr(input.getRevisionNr()); + result.setFile(input.getFile()); + result.setSerializerOid(input.getSerializerOid()); return result; } - public Set convertToSSetServiceInterface(Collection input) { - Set result = new HashSet(); - for (ServiceInterface o : input) { + public Set convertToSSetDataValue(Collection input) { + Set result = new HashSet(); + for (DataValue o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetServiceInterface(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SServiceInterface o : input) { + public Set convertFromSSetDataValue(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SDataValue o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListServiceInterface(Collection input) { - List result = new ArrayList(); - for (ServiceInterface o : input) { + public List convertToSListDataValue(Collection input) { + List result = new ArrayList(); + for (DataValue o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListServiceInterface(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SServiceInterface o : input) { + public List convertFromSListDataValue(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SDataValue o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SServiceInterface convertToSObject(ServiceInterface input) { + public SDataValue convertToSObject(DataValue input) { if (input == null) { return null; } - SServiceInterface result = new SServiceInterface(); - result.setName(input.getName()); - result.setNameSpace(input.getNameSpace()); - result.setSimpleName(input.getSimpleName()); + if (input instanceof ListDataValue) { + return convertToSObject((ListDataValue)input); + } + else if (input instanceof SimpleDataValue) { + return convertToSObject((SimpleDataValue)input); + } + else if (input instanceof ReferenceDataValue) { + return convertToSObject((ReferenceDataValue)input); + } + SDataValue result = new SDataValue(); + result.setOid(input.getOid()); + result.setRid(input.getRid()); + result.setFieldName(input.getFieldName()); return result; } - public ServiceInterface convertFromSObject(SServiceInterface input, DatabaseSession session) throws BimserverDatabaseException { + public DataValue convertFromSObject(SDataValue input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ServiceInterface result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceInterface(), session); + DataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createDataValue(), session); + + ((IdEObjectImpl)result).setOid(input.getOid()); + ((IdEObjectImpl)result).setRid(input.getRid()); return result; } - public ServiceInterface convertFromSObject(SServiceInterface input) throws BimserverDatabaseException { - ServiceInterface result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceInterface(), null); + public DataValue convertFromSObject(SDataValue input) throws BimserverDatabaseException { + DataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createDataValue(), null); return result; } - public ServiceInterface convertFromSObject(SServiceInterface input, ServiceInterface result, DatabaseSession session) throws BimserverDatabaseException { + public DataValue convertFromSObject(SDataValue input, DataValue result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setName(input.getName()); - result.setNameSpace(input.getNameSpace()); - result.setSimpleName(input.getSimpleName()); + if (input instanceof SListDataValue) { + return convertFromSObject((SListDataValue)input, session); + } + else if (input instanceof SSimpleDataValue) { + return convertFromSObject((SSimpleDataValue)input, session); + } + else if (input instanceof SReferenceDataValue) { + return convertFromSObject((SReferenceDataValue)input, session); + } + result.setFieldName(input.getFieldName()); return result; } - public Set convertToSSetServiceMethod(Collection input) { - Set result = new HashSet(); - for (ServiceMethod o : input) { + public Set convertToSSetDataObject(Collection input) { + Set result = new HashSet(); + for (DataObject o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetServiceMethod(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SServiceMethod o : input) { + public Set convertFromSSetDataObject(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SDataObject o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListServiceMethod(Collection input) { - List result = new ArrayList(); - for (ServiceMethod o : input) { + public List convertToSListDataObject(Collection input) { + List result = new ArrayList(); + for (DataObject o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListServiceMethod(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SServiceMethod o : input) { + public List convertFromSListDataObject(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SDataObject o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SServiceMethod convertToSObject(ServiceMethod input) { + public SDataObject convertToSObject(DataObject input) { if (input == null) { return null; } - SServiceMethod result = new SServiceMethod(); + SDataObject result = new SDataObject(); + result.setOid(input.getOid()); + result.setRid(input.getRid()); + result.setType(input.getType()); + result.setGuid(input.getGuid()); result.setName(input.getName()); - result.setDoc(input.getDoc()); - result.setReturnDoc(input.getReturnDoc()); + List listvalues = new ArrayList(); + for (DataValue v : input.getValues()) { + listvalues.add(convertToSObject(v)); + } + result.setValues(listvalues); return result; } - public ServiceMethod convertFromSObject(SServiceMethod input, DatabaseSession session) throws BimserverDatabaseException { + public DataObject convertFromSObject(SDataObject input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ServiceMethod result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceMethod(), session); + DataObject result = convertFromSObject(input, StoreFactory.eINSTANCE.createDataObject(), session); + + ((IdEObjectImpl)result).setOid(input.getOid()); + ((IdEObjectImpl)result).setRid(input.getRid()); return result; } - public ServiceMethod convertFromSObject(SServiceMethod input) throws BimserverDatabaseException { - ServiceMethod result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceMethod(), null); + public DataObject convertFromSObject(SDataObject input) throws BimserverDatabaseException { + DataObject result = convertFromSObject(input, StoreFactory.eINSTANCE.createDataObject(), null); return result; } - public ServiceMethod convertFromSObject(SServiceMethod input, ServiceMethod result, DatabaseSession session) throws BimserverDatabaseException { + public DataObject convertFromSObject(SDataObject input, DataObject result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } + result.setType(input.getType()); + result.setGuid(input.getGuid()); result.setName(input.getName()); - result.setDoc(input.getDoc()); - result.setReturnDoc(input.getReturnDoc()); + List listvalues = result.getValues(); + for (SDataValue v : input.getValues()) { + listvalues.add(convertFromSObject(v, session)); + } return result; } - public SServiceSimpleType convertToSObject(ServiceSimpleType input) { - return SServiceSimpleType.values()[input.ordinal()]; - } - - public ServiceSimpleType convertFromSObject(SServiceSimpleType input) { - return ServiceSimpleType.values()[input.ordinal()]; - } - public Set convertToSSetServiceField(Collection input) { - Set result = new HashSet(); - for (ServiceField o : input) { + public Set convertToSSetUserSession(Collection input) { + Set result = new HashSet(); + for (UserSession o : input) { result.add(convertToSObject(o)); } return result; } - - public Set convertFromSSetServiceField(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SServiceField o : input) { + + public Set convertFromSSetUserSession(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SUserSession o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListServiceField(Collection input) { - List result = new ArrayList(); - for (ServiceField o : input) { + public List convertToSListUserSession(Collection input) { + List result = new ArrayList(); + for (UserSession o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListServiceField(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SServiceField o : input) { + public List convertFromSListUserSession(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SUserSession o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SServiceField convertToSObject(ServiceField input) { + public SUserSession convertToSObject(UserSession input) { if (input == null) { return null; } - SServiceField result = new SServiceField(); + SUserSession result = new SUserSession(); + result.setOid(input.getOid()); + result.setRid(input.getRid()); + result.setUsername(input.getUsername()); result.setName(input.getName()); - result.setDoc(input.getDoc()); - ServiceType typeVal = input.getType(); - result.setType(convertToSObject(typeVal)); - ServiceType genericTypeVal = input.getGenericType(); - result.setGenericType(convertToSObject(genericTypeVal)); + result.setType(SUserType.values()[input.getType().ordinal()]); + result.setRemoteAddress(input.getRemoteAddress()); + result.setActiveSince(input.getActiveSince()); + result.setLastActive(input.getLastActive()); + result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); + User userVal = input.getUser(); + result.setUserId(userVal == null ? -1 : userVal.getOid()); return result; } - public ServiceField convertFromSObject(SServiceField input, DatabaseSession session) throws BimserverDatabaseException { + public UserSession convertFromSObject(SUserSession input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ServiceField result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceField(), session); + UserSession result = convertFromSObject(input, StoreFactory.eINSTANCE.createUserSession(), session); + + ((IdEObjectImpl)result).setOid(input.getOid()); + ((IdEObjectImpl)result).setRid(input.getRid()); return result; } - public ServiceField convertFromSObject(SServiceField input) throws BimserverDatabaseException { - ServiceField result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceField(), null); + public UserSession convertFromSObject(SUserSession input) throws BimserverDatabaseException { + UserSession result = convertFromSObject(input, StoreFactory.eINSTANCE.createUserSession(), null); return result; } - public ServiceField convertFromSObject(SServiceField input, ServiceField result, DatabaseSession session) throws BimserverDatabaseException { + public UserSession convertFromSObject(SUserSession input, UserSession result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } + result.setUsername(input.getUsername()); result.setName(input.getName()); - result.setDoc(input.getDoc()); - result.setType(convertFromSObject(input.getType(), session)); - result.setGenericType(convertFromSObject(input.getGenericType(), session)); + result.setType(UserType.values()[input.getType().ordinal()]); + result.setRemoteAddress(input.getRemoteAddress()); + result.setActiveSince(input.getActiveSince()); + result.setLastActive(input.getLastActive()); + result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); + result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); return result; } - public Set convertToSSetServiceType(Collection input) { - Set result = new HashSet(); - for (ServiceType o : input) { + public Set convertToSSetMigration(Collection input) { + Set result = new HashSet(); + for (Migration o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetServiceType(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SServiceType o : input) { + public Set convertFromSSetMigration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SMigration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListServiceType(Collection input) { - List result = new ArrayList(); - for (ServiceType o : input) { + public List convertToSListMigration(Collection input) { + List result = new ArrayList(); + for (Migration o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListServiceType(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SServiceType o : input) { + public List convertFromSListMigration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SMigration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SServiceType convertToSObject(ServiceType input) { + public SMigration convertToSObject(Migration input) { if (input == null) { return null; } - SServiceType result = new SServiceType(); + SMigration result = new SMigration(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setName(input.getName()); - result.setSimpleName(input.getSimpleName()); - result.setSimpleType(SServiceSimpleType.values()[input.getSimpleType().ordinal()]); - List listfields = new ArrayList(); - for (ServiceField v : input.getFields()) { - listfields.add(convertToSObject(v)); - } - result.setFields(listfields); + result.setNumber(input.getNumber()); + result.setDescription(input.getDescription()); + result.setExecuted(input.getExecuted()); return result; } - public ServiceType convertFromSObject(SServiceType input, DatabaseSession session) throws BimserverDatabaseException { + public Migration convertFromSObject(SMigration input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ServiceType result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceType(), session); + Migration result = convertFromSObject(input, StoreFactory.eINSTANCE.createMigration(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -5160,524 +5253,556 @@ public ServiceType convertFromSObject(SServiceType input, DatabaseSession sessio return result; } - public ServiceType convertFromSObject(SServiceType input) throws BimserverDatabaseException { - ServiceType result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceType(), null); + public Migration convertFromSObject(SMigration input) throws BimserverDatabaseException { + Migration result = convertFromSObject(input, StoreFactory.eINSTANCE.createMigration(), null); return result; } - public ServiceType convertFromSObject(SServiceType input, ServiceType result, DatabaseSession session) throws BimserverDatabaseException { + public Migration convertFromSObject(SMigration input, Migration result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setName(input.getName()); - result.setSimpleName(input.getSimpleName()); - result.setSimpleType(ServiceSimpleType.values()[input.getSimpleType().ordinal()]); - List listfields = result.getFields(); - for (SServiceField v : input.getFields()) { - listfields.add(convertFromSObject(v, session)); - } + result.setNumber(input.getNumber()); + result.setDescription(input.getDescription()); + result.setExecuted(input.getExecuted()); return result; } - public Set convertToSSetServiceParameter(Collection input) { - Set result = new HashSet(); - for (ServiceParameter o : input) { + public Set convertToSSetReferenceDataValue(Collection input) { + Set result = new HashSet(); + for (ReferenceDataValue o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetServiceParameter(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SServiceParameter o : input) { + public Set convertFromSSetReferenceDataValue(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SReferenceDataValue o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListServiceParameter(Collection input) { - List result = new ArrayList(); - for (ServiceParameter o : input) { + public List convertToSListReferenceDataValue(Collection input) { + List result = new ArrayList(); + for (ReferenceDataValue o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListServiceParameter(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SServiceParameter o : input) { + public List convertFromSListReferenceDataValue(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SReferenceDataValue o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SServiceParameter convertToSObject(ServiceParameter input) { + public SReferenceDataValue convertToSObject(ReferenceDataValue input) { if (input == null) { return null; } - SServiceParameter result = new SServiceParameter(); - result.setName(input.getName()); - result.setDoc(input.getDoc()); - ServiceType typeVal = input.getType(); - result.setType(convertToSObject(typeVal)); - ServiceType genericTypeVal = input.getGenericType(); - result.setGenericType(convertToSObject(genericTypeVal)); + SReferenceDataValue result = new SReferenceDataValue(); + result.setOid(input.getOid()); + result.setRid(input.getRid()); + result.setFieldName(input.getFieldName()); + result.setTypeName(input.getTypeName()); + result.setGuid(input.getGuid()); return result; } - public ServiceParameter convertFromSObject(SServiceParameter input, DatabaseSession session) throws BimserverDatabaseException { + public ReferenceDataValue convertFromSObject(SReferenceDataValue input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ServiceParameter result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceParameter(), session); + ReferenceDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createReferenceDataValue(), session); + + ((IdEObjectImpl)result).setOid(input.getOid()); + ((IdEObjectImpl)result).setRid(input.getRid()); return result; } - public ServiceParameter convertFromSObject(SServiceParameter input) throws BimserverDatabaseException { - ServiceParameter result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceParameter(), null); + public ReferenceDataValue convertFromSObject(SReferenceDataValue input) throws BimserverDatabaseException { + ReferenceDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createReferenceDataValue(), null); return result; } - public ServiceParameter convertFromSObject(SServiceParameter input, ServiceParameter result, DatabaseSession session) throws BimserverDatabaseException { + public ReferenceDataValue convertFromSObject(SReferenceDataValue input, ReferenceDataValue result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setName(input.getName()); - result.setDoc(input.getDoc()); - result.setType(convertFromSObject(input.getType(), session)); - result.setGenericType(convertFromSObject(input.getGenericType(), session)); + result.setFieldName(input.getFieldName()); + result.setTypeName(input.getTypeName()); + result.setGuid(input.getGuid()); return result; } - public SPrimitiveEnum convertToSObject(PrimitiveEnum input) { - return SPrimitiveEnum.values()[input.ordinal()]; - } - - public PrimitiveEnum convertFromSObject(SPrimitiveEnum input) { - return PrimitiveEnum.values()[input.ordinal()]; - } - public Set convertToSSetTypeDefinition(Collection input) { - Set result = new HashSet(); - for (TypeDefinition o : input) { + public Set convertToSSetListDataValue(Collection input) { + Set result = new HashSet(); + for (ListDataValue o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetTypeDefinition(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (STypeDefinition o : input) { + public Set convertFromSSetListDataValue(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SListDataValue o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListTypeDefinition(Collection input) { - List result = new ArrayList(); - for (TypeDefinition o : input) { + public List convertToSListListDataValue(Collection input) { + List result = new ArrayList(); + for (ListDataValue o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListTypeDefinition(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (STypeDefinition o : input) { + public List convertFromSListListDataValue(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SListDataValue o : input) { result.add(convertFromSObject(o, session)); } return result; } - public STypeDefinition convertToSObject(TypeDefinition input) { + public SListDataValue convertToSObject(ListDataValue input) { if (input == null) { return null; } - if (input instanceof ArrayDefinition) { - return convertToSObject((ArrayDefinition)input); - } - else if (input instanceof ObjectDefinition) { - return convertToSObject((ObjectDefinition)input); - } - else if (input instanceof PrimitiveDefinition) { - return convertToSObject((PrimitiveDefinition)input); + SListDataValue result = new SListDataValue(); + result.setOid(input.getOid()); + result.setRid(input.getRid()); + result.setFieldName(input.getFieldName()); + List listvalues = new ArrayList(); + for (DataValue v : input.getValues()) { + listvalues.add(convertToSObject(v)); } - STypeDefinition result = new STypeDefinition(); + result.setValues(listvalues); return result; } - public TypeDefinition convertFromSObject(STypeDefinition input, DatabaseSession session) throws BimserverDatabaseException { + public ListDataValue convertFromSObject(SListDataValue input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - TypeDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createTypeDefinition(), session); + ListDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createListDataValue(), session); + + ((IdEObjectImpl)result).setOid(input.getOid()); + ((IdEObjectImpl)result).setRid(input.getRid()); return result; } - public TypeDefinition convertFromSObject(STypeDefinition input) throws BimserverDatabaseException { - TypeDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createTypeDefinition(), null); + public ListDataValue convertFromSObject(SListDataValue input) throws BimserverDatabaseException { + ListDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createListDataValue(), null); return result; } - public TypeDefinition convertFromSObject(STypeDefinition input, TypeDefinition result, DatabaseSession session) throws BimserverDatabaseException { + public ListDataValue convertFromSObject(SListDataValue input, ListDataValue result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - if (input instanceof SArrayDefinition) { - return convertFromSObject((SArrayDefinition)input, session); - } - else if (input instanceof SObjectDefinition) { - return convertFromSObject((SObjectDefinition)input, session); - } - else if (input instanceof SPrimitiveDefinition) { - return convertFromSObject((SPrimitiveDefinition)input, session); + result.setFieldName(input.getFieldName()); + List listvalues = result.getValues(); + for (SDataValue v : input.getValues()) { + listvalues.add(convertFromSObject(v, session)); } return result; - } - - public Set convertToSSetObjectDefinition(Collection input) { - Set result = new HashSet(); - for (ObjectDefinition o : input) { + } + + public Set convertToSSetSimpleDataValue(Collection input) { + Set result = new HashSet(); + for (SimpleDataValue o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetObjectDefinition(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SObjectDefinition o : input) { + public Set convertFromSSetSimpleDataValue(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SSimpleDataValue o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListObjectDefinition(Collection input) { - List result = new ArrayList(); - for (ObjectDefinition o : input) { + public List convertToSListSimpleDataValue(Collection input) { + List result = new ArrayList(); + for (SimpleDataValue o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListObjectDefinition(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SObjectDefinition o : input) { + public List convertFromSListSimpleDataValue(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SSimpleDataValue o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SObjectDefinition convertToSObject(ObjectDefinition input) { + public SSimpleDataValue convertToSObject(SimpleDataValue input) { if (input == null) { return null; } - SObjectDefinition result = new SObjectDefinition(); - List listparameters = new ArrayList(); - for (ParameterDefinition v : input.getParameters()) { - listparameters.add(convertToSObject(v)); - } - result.setParameters(listparameters); + SSimpleDataValue result = new SSimpleDataValue(); + result.setOid(input.getOid()); + result.setRid(input.getRid()); + result.setFieldName(input.getFieldName()); + result.setStringValue(input.getStringValue()); return result; } - public ObjectDefinition convertFromSObject(SObjectDefinition input, DatabaseSession session) throws BimserverDatabaseException { + public SimpleDataValue convertFromSObject(SSimpleDataValue input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ObjectDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectDefinition(), session); + SimpleDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createSimpleDataValue(), session); + + ((IdEObjectImpl)result).setOid(input.getOid()); + ((IdEObjectImpl)result).setRid(input.getRid()); return result; } - public ObjectDefinition convertFromSObject(SObjectDefinition input) throws BimserverDatabaseException { - ObjectDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectDefinition(), null); + public SimpleDataValue convertFromSObject(SSimpleDataValue input) throws BimserverDatabaseException { + SimpleDataValue result = convertFromSObject(input, StoreFactory.eINSTANCE.createSimpleDataValue(), null); return result; } - public ObjectDefinition convertFromSObject(SObjectDefinition input, ObjectDefinition result, DatabaseSession session) throws BimserverDatabaseException { + public SimpleDataValue convertFromSObject(SSimpleDataValue input, SimpleDataValue result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - List listparameters = result.getParameters(); - for (SParameterDefinition v : input.getParameters()) { - listparameters.add(convertFromSObject(v, session)); - } + result.setFieldName(input.getFieldName()); + result.setStringValue(input.getStringValue()); return result; } - public Set convertToSSetPrimitiveDefinition(Collection input) { - Set result = new HashSet(); - for (PrimitiveDefinition o : input) { + public Set convertToSSetDatabaseInformationItem(Collection input) { + Set result = new HashSet(); + for (DatabaseInformationItem o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetPrimitiveDefinition(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SPrimitiveDefinition o : input) { + public Set convertFromSSetDatabaseInformationItem(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SDatabaseInformationItem o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListPrimitiveDefinition(Collection input) { - List result = new ArrayList(); - for (PrimitiveDefinition o : input) { + public List convertToSListDatabaseInformationItem(Collection input) { + List result = new ArrayList(); + for (DatabaseInformationItem o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListPrimitiveDefinition(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SPrimitiveDefinition o : input) { + public List convertFromSListDatabaseInformationItem(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SDatabaseInformationItem o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SPrimitiveDefinition convertToSObject(PrimitiveDefinition input) { + public SDatabaseInformationItem convertToSObject(DatabaseInformationItem input) { if (input == null) { return null; } - SPrimitiveDefinition result = new SPrimitiveDefinition(); - result.setType(SPrimitiveEnum.values()[input.getType().ordinal()]); + SDatabaseInformationItem result = new SDatabaseInformationItem(); + result.setOid(input.getOid()); + result.setRid(input.getRid()); + result.setKey(input.getKey()); + result.setValue(input.getValue()); return result; } - public PrimitiveDefinition convertFromSObject(SPrimitiveDefinition input, DatabaseSession session) throws BimserverDatabaseException { + public DatabaseInformationItem convertFromSObject(SDatabaseInformationItem input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - PrimitiveDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createPrimitiveDefinition(), session); + DatabaseInformationItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformationItem(), session); + + ((IdEObjectImpl)result).setOid(input.getOid()); + ((IdEObjectImpl)result).setRid(input.getRid()); return result; } - public PrimitiveDefinition convertFromSObject(SPrimitiveDefinition input) throws BimserverDatabaseException { - PrimitiveDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createPrimitiveDefinition(), null); + public DatabaseInformationItem convertFromSObject(SDatabaseInformationItem input) throws BimserverDatabaseException { + DatabaseInformationItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformationItem(), null); return result; } - public PrimitiveDefinition convertFromSObject(SPrimitiveDefinition input, PrimitiveDefinition result, DatabaseSession session) throws BimserverDatabaseException { + public DatabaseInformationItem convertFromSObject(SDatabaseInformationItem input, DatabaseInformationItem result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setType(PrimitiveEnum.values()[input.getType().ordinal()]); + result.setKey(input.getKey()); + result.setValue(input.getValue()); return result; } - public Set convertToSSetArrayDefinition(Collection input) { - Set result = new HashSet(); - for (ArrayDefinition o : input) { + public Set convertToSSetDatabaseInformationCategory(Collection input) { + Set result = new HashSet(); + for (DatabaseInformationCategory o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetArrayDefinition(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SArrayDefinition o : input) { + public Set convertFromSSetDatabaseInformationCategory(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SDatabaseInformationCategory o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListArrayDefinition(Collection input) { - List result = new ArrayList(); - for (ArrayDefinition o : input) { + public List convertToSListDatabaseInformationCategory(Collection input) { + List result = new ArrayList(); + for (DatabaseInformationCategory o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListArrayDefinition(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SArrayDefinition o : input) { + public List convertFromSListDatabaseInformationCategory(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SDatabaseInformationCategory o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SArrayDefinition convertToSObject(ArrayDefinition input) { + public SDatabaseInformationCategory convertToSObject(DatabaseInformationCategory input) { if (input == null) { return null; } - SArrayDefinition result = new SArrayDefinition(); - TypeDefinition typeVal = input.getType(); - result.setType(convertToSObject(typeVal)); + SDatabaseInformationCategory result = new SDatabaseInformationCategory(); + result.setOid(input.getOid()); + result.setRid(input.getRid()); + result.setTitle(input.getTitle()); + List listitems = new ArrayList(); + for (DatabaseInformationItem v : input.getItems()) { + listitems.add(convertToSObject(v)); + } + result.setItems(listitems); return result; } - public ArrayDefinition convertFromSObject(SArrayDefinition input, DatabaseSession session) throws BimserverDatabaseException { + public DatabaseInformationCategory convertFromSObject(SDatabaseInformationCategory input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ArrayDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createArrayDefinition(), session); + DatabaseInformationCategory result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformationCategory(), session); + + ((IdEObjectImpl)result).setOid(input.getOid()); + ((IdEObjectImpl)result).setRid(input.getRid()); return result; } - public ArrayDefinition convertFromSObject(SArrayDefinition input) throws BimserverDatabaseException { - ArrayDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createArrayDefinition(), null); + public DatabaseInformationCategory convertFromSObject(SDatabaseInformationCategory input) throws BimserverDatabaseException { + DatabaseInformationCategory result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformationCategory(), null); return result; } - public ArrayDefinition convertFromSObject(SArrayDefinition input, ArrayDefinition result, DatabaseSession session) throws BimserverDatabaseException { + public DatabaseInformationCategory convertFromSObject(SDatabaseInformationCategory input, DatabaseInformationCategory result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setType(convertFromSObject(input.getType(), session)); + result.setTitle(input.getTitle()); + List listitems = result.getItems(); + for (SDatabaseInformationItem v : input.getItems()) { + listitems.add(convertFromSObject(v, session)); + } return result; } - public Set convertToSSetParameterDefinition(Collection input) { - Set result = new HashSet(); - for (ParameterDefinition o : input) { + public Set convertToSSetDatabaseInformation(Collection input) { + Set result = new HashSet(); + for (DatabaseInformation o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetParameterDefinition(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SParameterDefinition o : input) { + public Set convertFromSSetDatabaseInformation(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SDatabaseInformation o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListParameterDefinition(Collection input) { - List result = new ArrayList(); - for (ParameterDefinition o : input) { + public List convertToSListDatabaseInformation(Collection input) { + List result = new ArrayList(); + for (DatabaseInformation o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListParameterDefinition(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SParameterDefinition o : input) { + public List convertFromSListDatabaseInformation(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SDatabaseInformation o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SParameterDefinition convertToSObject(ParameterDefinition input) { + public SDatabaseInformation convertToSObject(DatabaseInformation input) { if (input == null) { return null; } - SParameterDefinition result = new SParameterDefinition(); - result.setName(input.getName()); - result.setIdentifier(input.getIdentifier()); - result.setRequired(input.isRequired()); - result.setDescription(input.getDescription()); - TypeDefinition typeVal = input.getType(); - result.setType(convertToSObject(typeVal)); - Type defaultValueVal = input.getDefaultValue(); - result.setDefaultValue(convertToSObject(defaultValueVal)); + SDatabaseInformation result = new SDatabaseInformation(); + result.setOid(input.getOid()); + result.setRid(input.getRid()); + result.setNumberOfProjects(input.getNumberOfProjects()); + result.setNumberOfUsers(input.getNumberOfUsers()); + result.setNumberOfRevisions(input.getNumberOfRevisions()); + result.setNumberOfCheckouts(input.getNumberOfCheckouts()); + result.setDatabaseSizeInBytes(input.getDatabaseSizeInBytes()); + result.setType(input.getType()); + result.setCreated(input.getCreated()); + result.setLocation(input.getLocation()); + result.setSchemaVersion(input.getSchemaVersion()); + List listcategories = new ArrayList(); + for (DatabaseInformationCategory v : input.getCategories()) { + listcategories.add(convertToSObject(v)); + } + result.setCategories(listcategories); return result; } - public ParameterDefinition convertFromSObject(SParameterDefinition input, DatabaseSession session) throws BimserverDatabaseException { + public DatabaseInformation convertFromSObject(SDatabaseInformation input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ParameterDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createParameterDefinition(), session); + DatabaseInformation result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformation(), session); + + ((IdEObjectImpl)result).setOid(input.getOid()); + ((IdEObjectImpl)result).setRid(input.getRid()); return result; } - public ParameterDefinition convertFromSObject(SParameterDefinition input) throws BimserverDatabaseException { - ParameterDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createParameterDefinition(), null); + public DatabaseInformation convertFromSObject(SDatabaseInformation input) throws BimserverDatabaseException { + DatabaseInformation result = convertFromSObject(input, StoreFactory.eINSTANCE.createDatabaseInformation(), null); return result; } - public ParameterDefinition convertFromSObject(SParameterDefinition input, ParameterDefinition result, DatabaseSession session) throws BimserverDatabaseException { + public DatabaseInformation convertFromSObject(SDatabaseInformation input, DatabaseInformation result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setName(input.getName()); - result.setIdentifier(input.getIdentifier()); - result.setRequired(input.isRequired()); - result.setDescription(input.getDescription()); - result.setType(convertFromSObject(input.getType(), session)); - result.setDefaultValue(convertFromSObject(input.getDefaultValue(), session)); + result.setNumberOfProjects(input.getNumberOfProjects()); + result.setNumberOfUsers(input.getNumberOfUsers()); + result.setNumberOfRevisions(input.getNumberOfRevisions()); + result.setNumberOfCheckouts(input.getNumberOfCheckouts()); + result.setDatabaseSizeInBytes(input.getDatabaseSizeInBytes()); + result.setType(input.getType()); + result.setCreated(input.getCreated()); + result.setLocation(input.getLocation()); + result.setSchemaVersion(input.getSchemaVersion()); + List listcategories = result.getCategories(); + for (SDatabaseInformationCategory v : input.getCategories()) { + listcategories.add(convertFromSObject(v, session)); + } return result; } - public Set convertToSSetType(Collection input) { - Set result = new HashSet(); - for (Type o : input) { + public Set convertToSSetPluginDescriptor(Collection input) { + Set result = new HashSet(); + for (PluginDescriptor o : input) { result.add(convertToSObject(o)); } return result; - } - - public Set convertFromSSetType(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SType o : input) { + } + + public Set convertFromSSetPluginDescriptor(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SPluginDescriptor o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListType(Collection input) { - List result = new ArrayList(); - for (Type o : input) { + public List convertToSListPluginDescriptor(Collection input) { + List result = new ArrayList(); + for (PluginDescriptor o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListType(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SType o : input) { + public List convertFromSListPluginDescriptor(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SPluginDescriptor o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SType convertToSObject(Type input) { + public SPluginDescriptor convertToSObject(PluginDescriptor input) { if (input == null) { return null; } - if (input instanceof ArrayType) { - return convertToSObject((ArrayType)input); - } - else if (input instanceof ObjectType) { - return convertToSObject((ObjectType)input); - } - else if (input instanceof PrimitiveType) { - return convertToSObject((PrimitiveType)input); - } - SType result = new SType(); + SPluginDescriptor result = new SPluginDescriptor(); result.setOid(input.getOid()); result.setRid(input.getRid()); + result.setName(input.getName()); + result.setPluginClassName(input.getPluginClassName()); + result.setDescription(input.getDescription()); + result.setLocation(input.getLocation()); + result.setEnabled(input.getEnabled()); + result.setPluginInterfaceClassName(input.getPluginInterfaceClassName()); + result.setIdentifier(input.getIdentifier()); + result.setInstallForNewUsers(input.isInstallForNewUsers()); + List listconfigurations = new ArrayList(); + for (PluginConfiguration v : input.getConfigurations()) { + listconfigurations.add(v.getOid()); + } + result.setConfigurations(listconfigurations); + PluginBundleVersion pluginBundleVersionVal = input.getPluginBundleVersion(); + result.setPluginBundleVersionId(pluginBundleVersionVal == null ? -1 : pluginBundleVersionVal.getOid()); return result; } - public Type convertFromSObject(SType input, DatabaseSession session) throws BimserverDatabaseException { + public PluginDescriptor convertFromSObject(SPluginDescriptor input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - Type result = convertFromSObject(input, StoreFactory.eINSTANCE.createType(), session); + PluginDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginDescriptor(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -5685,82 +5810,83 @@ public Type convertFromSObject(SType input, DatabaseSession session) throws Bims return result; } - public Type convertFromSObject(SType input) throws BimserverDatabaseException { - Type result = convertFromSObject(input, StoreFactory.eINSTANCE.createType(), null); + public PluginDescriptor convertFromSObject(SPluginDescriptor input) throws BimserverDatabaseException { + PluginDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginDescriptor(), null); return result; } - public Type convertFromSObject(SType input, Type result, DatabaseSession session) throws BimserverDatabaseException { + public PluginDescriptor convertFromSObject(SPluginDescriptor input, PluginDescriptor result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - if (input instanceof SArrayType) { - return convertFromSObject((SArrayType)input, session); - } - else if (input instanceof SObjectType) { - return convertFromSObject((SObjectType)input, session); - } - else if (input instanceof SPrimitiveType) { - return convertFromSObject((SPrimitiveType)input, session); + result.setName(input.getName()); + result.setPluginClassName(input.getPluginClassName()); + result.setDescription(input.getDescription()); + result.setLocation(input.getLocation()); + result.setEnabled(input.getEnabled()); + result.setPluginInterfaceClassName(input.getPluginInterfaceClassName()); + result.setIdentifier(input.getIdentifier()); + result.setInstallForNewUsers(input.isInstallForNewUsers()); + List listconfigurations = result.getConfigurations(); + for (long oid : input.getConfigurations()) { + listconfigurations.add((PluginConfiguration)session.get(StorePackage.eINSTANCE.getPluginConfiguration(), oid, OldQuery.getDefault())); } + result.setPluginBundleVersion((PluginBundleVersion)session.get(StorePackage.eINSTANCE.getPluginBundleVersion(), input.getPluginBundleVersionId(), OldQuery.getDefault())); return result; } - public Set convertToSSetObjectType(Collection input) { - Set result = new HashSet(); - for (ObjectType o : input) { + public Set convertToSSetRevisionSummaryType(Collection input) { + Set result = new HashSet(); + for (RevisionSummaryType o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetObjectType(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SObjectType o : input) { + public Set convertFromSSetRevisionSummaryType(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SRevisionSummaryType o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListObjectType(Collection input) { - List result = new ArrayList(); - for (ObjectType o : input) { + public List convertToSListRevisionSummaryType(Collection input) { + List result = new ArrayList(); + for (RevisionSummaryType o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListObjectType(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SObjectType o : input) { + public List convertFromSListRevisionSummaryType(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SRevisionSummaryType o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SObjectType convertToSObject(ObjectType input) { + public SRevisionSummaryType convertToSObject(RevisionSummaryType input) { if (input == null) { return null; } - SObjectType result = new SObjectType(); + SRevisionSummaryType result = new SRevisionSummaryType(); result.setOid(input.getOid()); result.setRid(input.getRid()); result.setName(input.getName()); - List listparameters = new ArrayList(); - for (Parameter v : input.getParameters()) { - listparameters.add(convertToSObject(v)); - } - result.setParameters(listparameters); + result.setCount(input.getCount()); + result.setSchema(input.getSchema()); return result; } - public ObjectType convertFromSObject(SObjectType input, DatabaseSession session) throws BimserverDatabaseException { + public RevisionSummaryType convertFromSObject(SRevisionSummaryType input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ObjectType result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectType(), session); + RevisionSummaryType result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummaryType(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -5768,87 +5894,76 @@ public ObjectType convertFromSObject(SObjectType input, DatabaseSession session) return result; } - public ObjectType convertFromSObject(SObjectType input) throws BimserverDatabaseException { - ObjectType result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectType(), null); + public RevisionSummaryType convertFromSObject(SRevisionSummaryType input) throws BimserverDatabaseException { + RevisionSummaryType result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummaryType(), null); return result; } - public ObjectType convertFromSObject(SObjectType input, ObjectType result, DatabaseSession session) throws BimserverDatabaseException { + public RevisionSummaryType convertFromSObject(SRevisionSummaryType input, RevisionSummaryType result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } result.setName(input.getName()); - List listparameters = result.getParameters(); - for (SParameter v : input.getParameters()) { - listparameters.add(convertFromSObject(v, session)); - } + result.setCount(input.getCount()); + result.setSchema(input.getSchema()); return result; } - public Set convertToSSetPrimitiveType(Collection input) { - Set result = new HashSet(); - for (PrimitiveType o : input) { + public Set convertToSSetRevisionSummaryContainer(Collection input) { + Set result = new HashSet(); + for (RevisionSummaryContainer o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetPrimitiveType(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SPrimitiveType o : input) { + public Set convertFromSSetRevisionSummaryContainer(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SRevisionSummaryContainer o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListPrimitiveType(Collection input) { - List result = new ArrayList(); - for (PrimitiveType o : input) { + public List convertToSListRevisionSummaryContainer(Collection input) { + List result = new ArrayList(); + for (RevisionSummaryContainer o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListPrimitiveType(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SPrimitiveType o : input) { + public List convertFromSListRevisionSummaryContainer(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SRevisionSummaryContainer o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SPrimitiveType convertToSObject(PrimitiveType input) { + public SRevisionSummaryContainer convertToSObject(RevisionSummaryContainer input) { if (input == null) { return null; } - if (input instanceof LongType) { - return convertToSObject((LongType)input); - } - else if (input instanceof DoubleType) { - return convertToSObject((DoubleType)input); - } - else if (input instanceof BooleanType) { - return convertToSObject((BooleanType)input); - } - else if (input instanceof ByteArrayType) { - return convertToSObject((ByteArrayType)input); - } - else if (input instanceof StringType) { - return convertToSObject((StringType)input); - } - SPrimitiveType result = new SPrimitiveType(); + SRevisionSummaryContainer result = new SRevisionSummaryContainer(); result.setOid(input.getOid()); result.setRid(input.getRid()); + result.setName(input.getName()); + List listtypes = new ArrayList(); + for (RevisionSummaryType v : input.getTypes()) { + listtypes.add(convertToSObject(v)); + } + result.setTypes(listtypes); return result; } - public PrimitiveType convertFromSObject(SPrimitiveType input, DatabaseSession session) throws BimserverDatabaseException { + public RevisionSummaryContainer convertFromSObject(SRevisionSummaryContainer input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - PrimitiveType result = convertFromSObject(input, StoreFactory.eINSTANCE.createPrimitiveType(), session); + RevisionSummaryContainer result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummaryContainer(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -5856,83 +5971,77 @@ public PrimitiveType convertFromSObject(SPrimitiveType input, DatabaseSession se return result; } - public PrimitiveType convertFromSObject(SPrimitiveType input) throws BimserverDatabaseException { - PrimitiveType result = convertFromSObject(input, StoreFactory.eINSTANCE.createPrimitiveType(), null); + public RevisionSummaryContainer convertFromSObject(SRevisionSummaryContainer input) throws BimserverDatabaseException { + RevisionSummaryContainer result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummaryContainer(), null); return result; } - public PrimitiveType convertFromSObject(SPrimitiveType input, PrimitiveType result, DatabaseSession session) throws BimserverDatabaseException { + public RevisionSummaryContainer convertFromSObject(SRevisionSummaryContainer input, RevisionSummaryContainer result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - if (input instanceof SLongType) { - return convertFromSObject((SLongType)input, session); - } - else if (input instanceof SDoubleType) { - return convertFromSObject((SDoubleType)input, session); - } - else if (input instanceof SBooleanType) { - return convertFromSObject((SBooleanType)input, session); - } - else if (input instanceof SByteArrayType) { - return convertFromSObject((SByteArrayType)input, session); - } - else if (input instanceof SStringType) { - return convertFromSObject((SStringType)input, session); + result.setName(input.getName()); + List listtypes = result.getTypes(); + for (SRevisionSummaryType v : input.getTypes()) { + listtypes.add(convertFromSObject(v, session)); } return result; } - public Set convertToSSetLongType(Collection input) { - Set result = new HashSet(); - for (LongType o : input) { + public Set convertToSSetRevisionSummary(Collection input) { + Set result = new HashSet(); + for (RevisionSummary o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetLongType(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SLongType o : input) { + public Set convertFromSSetRevisionSummary(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SRevisionSummary o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListLongType(Collection input) { - List result = new ArrayList(); - for (LongType o : input) { + public List convertToSListRevisionSummary(Collection input) { + List result = new ArrayList(); + for (RevisionSummary o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListLongType(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SLongType o : input) { + public List convertFromSListRevisionSummary(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SRevisionSummary o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SLongType convertToSObject(LongType input) { + public SRevisionSummary convertToSObject(RevisionSummary input) { if (input == null) { return null; } - SLongType result = new SLongType(); + SRevisionSummary result = new SRevisionSummary(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setValue(input.getValue()); + List listlist = new ArrayList(); + for (RevisionSummaryContainer v : input.getList()) { + listlist.add(convertToSObject(v)); + } + result.setList(listlist); return result; } - public LongType convertFromSObject(SLongType input, DatabaseSession session) throws BimserverDatabaseException { + public RevisionSummary convertFromSObject(SRevisionSummary input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - LongType result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongType(), session); + RevisionSummary result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummary(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -5940,69 +6049,77 @@ public LongType convertFromSObject(SLongType input, DatabaseSession session) thr return result; } - public LongType convertFromSObject(SLongType input) throws BimserverDatabaseException { - LongType result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongType(), null); + public RevisionSummary convertFromSObject(SRevisionSummary input) throws BimserverDatabaseException { + RevisionSummary result = convertFromSObject(input, StoreFactory.eINSTANCE.createRevisionSummary(), null); return result; } - public LongType convertFromSObject(SLongType input, LongType result, DatabaseSession session) throws BimserverDatabaseException { + public RevisionSummary convertFromSObject(SRevisionSummary input, RevisionSummary result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setValue(input.getValue()); + List listlist = result.getList(); + for (SRevisionSummaryContainer v : input.getList()) { + listlist.add(convertFromSObject(v, session)); + } return result; } - - public Set convertToSSetByteArrayType(Collection input) { - Set result = new HashSet(); - for (ByteArrayType o : input) { + + public Set convertToSSetLongAction(Collection input) { + Set result = new HashSet(); + for (LongAction o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetByteArrayType(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SByteArrayType o : input) { + public Set convertFromSSetLongAction(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SLongAction o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListByteArrayType(Collection input) { - List result = new ArrayList(); - for (ByteArrayType o : input) { + public List convertToSListLongAction(Collection input) { + List result = new ArrayList(); + for (LongAction o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListByteArrayType(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SByteArrayType o : input) { + public List convertFromSListLongAction(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SLongAction o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SByteArrayType convertToSObject(ByteArrayType input) { + public SLongAction convertToSObject(LongAction input) { if (input == null) { return null; } - SByteArrayType result = new SByteArrayType(); + SLongAction result = new SLongAction(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setValue(input.getValue()); + result.setIdentification(input.getIdentification()); + result.setStart(input.getStart()); + result.setUsername(input.getUsername()); + result.setName(input.getName()); + User userVal = input.getUser(); + result.setUserId(userVal == null ? -1 : userVal.getOid()); return result; } - public ByteArrayType convertFromSObject(SByteArrayType input, DatabaseSession session) throws BimserverDatabaseException { + public LongAction convertFromSObject(SLongAction input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ByteArrayType result = convertFromSObject(input, StoreFactory.eINSTANCE.createByteArrayType(), session); + LongAction result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongAction(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -6010,69 +6127,73 @@ public ByteArrayType convertFromSObject(SByteArrayType input, DatabaseSession se return result; } - public ByteArrayType convertFromSObject(SByteArrayType input) throws BimserverDatabaseException { - ByteArrayType result = convertFromSObject(input, StoreFactory.eINSTANCE.createByteArrayType(), null); + public LongAction convertFromSObject(SLongAction input) throws BimserverDatabaseException { + LongAction result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongAction(), null); return result; } - public ByteArrayType convertFromSObject(SByteArrayType input, ByteArrayType result, DatabaseSession session) throws BimserverDatabaseException { + public LongAction convertFromSObject(SLongAction input, LongAction result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setValue(input.getValue()); + result.setIdentification(input.getIdentification()); + result.setStart(input.getStart()); + result.setUsername(input.getUsername()); + result.setName(input.getName()); + result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); return result; } - public Set convertToSSetDoubleType(Collection input) { - Set result = new HashSet(); - for (DoubleType o : input) { + public Set convertToSSetObjectIDMPluginDescriptor(Collection input) { + Set result = new HashSet(); + for (ObjectIDMPluginDescriptor o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetDoubleType(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SDoubleType o : input) { + public Set convertFromSSetObjectIDMPluginDescriptor(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SObjectIDMPluginDescriptor o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListDoubleType(Collection input) { - List result = new ArrayList(); - for (DoubleType o : input) { + public List convertToSListObjectIDMPluginDescriptor(Collection input) { + List result = new ArrayList(); + for (ObjectIDMPluginDescriptor o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListDoubleType(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SDoubleType o : input) { + public List convertFromSListObjectIDMPluginDescriptor(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SObjectIDMPluginDescriptor o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SDoubleType convertToSObject(DoubleType input) { + public SObjectIDMPluginDescriptor convertToSObject(ObjectIDMPluginDescriptor input) { if (input == null) { return null; } - SDoubleType result = new SDoubleType(); + SObjectIDMPluginDescriptor result = new SObjectIDMPluginDescriptor(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setValue(input.getValue()); + result.setClassName(input.getClassName()); return result; } - public DoubleType convertFromSObject(SDoubleType input, DatabaseSession session) throws BimserverDatabaseException { + public ObjectIDMPluginDescriptor convertFromSObject(SObjectIDMPluginDescriptor input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - DoubleType result = convertFromSObject(input, StoreFactory.eINSTANCE.createDoubleType(), session); + ObjectIDMPluginDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectIDMPluginDescriptor(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -6080,69 +6201,86 @@ public DoubleType convertFromSObject(SDoubleType input, DatabaseSession session) return result; } - public DoubleType convertFromSObject(SDoubleType input) throws BimserverDatabaseException { - DoubleType result = convertFromSObject(input, StoreFactory.eINSTANCE.createDoubleType(), null); + public ObjectIDMPluginDescriptor convertFromSObject(SObjectIDMPluginDescriptor input) throws BimserverDatabaseException { + ObjectIDMPluginDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectIDMPluginDescriptor(), null); return result; } - public DoubleType convertFromSObject(SDoubleType input, DoubleType result, DatabaseSession session) throws BimserverDatabaseException { + public ObjectIDMPluginDescriptor convertFromSObject(SObjectIDMPluginDescriptor input, ObjectIDMPluginDescriptor result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setValue(input.getValue()); + result.setClassName(input.getClassName()); return result; } + public SCompareType convertToSObject(CompareType input) { + return SCompareType.values()[input.ordinal()]; + } + + public CompareType convertFromSObject(SCompareType input) { + return CompareType.values()[input.ordinal()]; + } - public Set convertToSSetStringType(Collection input) { - Set result = new HashSet(); - for (StringType o : input) { + public Set convertToSSetCompareItem(Collection input) { + Set result = new HashSet(); + for (CompareItem o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetStringType(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SStringType o : input) { + public Set convertFromSSetCompareItem(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SCompareItem o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListStringType(Collection input) { - List result = new ArrayList(); - for (StringType o : input) { + public List convertToSListCompareItem(Collection input) { + List result = new ArrayList(); + for (CompareItem o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListStringType(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SStringType o : input) { + public List convertFromSListCompareItem(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SCompareItem o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SStringType convertToSObject(StringType input) { + public SCompareItem convertToSObject(CompareItem input) { if (input == null) { return null; } - SStringType result = new SStringType(); + if (input instanceof ObjectModified) { + return convertToSObject((ObjectModified)input); + } + else if (input instanceof ObjectAdded) { + return convertToSObject((ObjectAdded)input); + } + else if (input instanceof ObjectRemoved) { + return convertToSObject((ObjectRemoved)input); + } + SCompareItem result = new SCompareItem(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setValue(input.getValue()); + DataObject dataObjectVal = input.getDataObject(); + result.setDataObject(convertToSObject(dataObjectVal)); return result; } - public StringType convertFromSObject(SStringType input, DatabaseSession session) throws BimserverDatabaseException { + public CompareItem convertFromSObject(SCompareItem input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - StringType result = convertFromSObject(input, StoreFactory.eINSTANCE.createStringType(), session); + CompareItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareItem(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -6150,69 +6288,79 @@ public StringType convertFromSObject(SStringType input, DatabaseSession session) return result; } - public StringType convertFromSObject(SStringType input) throws BimserverDatabaseException { - StringType result = convertFromSObject(input, StoreFactory.eINSTANCE.createStringType(), null); + public CompareItem convertFromSObject(SCompareItem input) throws BimserverDatabaseException { + CompareItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareItem(), null); return result; } - public StringType convertFromSObject(SStringType input, StringType result, DatabaseSession session) throws BimserverDatabaseException { + public CompareItem convertFromSObject(SCompareItem input, CompareItem result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setValue(input.getValue()); + if (input instanceof SObjectModified) { + return convertFromSObject((SObjectModified)input, session); + } + else if (input instanceof SObjectAdded) { + return convertFromSObject((SObjectAdded)input, session); + } + else if (input instanceof SObjectRemoved) { + return convertFromSObject((SObjectRemoved)input, session); + } + result.setDataObject(convertFromSObject(input.getDataObject(), session)); return result; } - public Set convertToSSetBooleanType(Collection input) { - Set result = new HashSet(); - for (BooleanType o : input) { + public Set convertToSSetObjectAdded(Collection input) { + Set result = new HashSet(); + for (ObjectAdded o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetBooleanType(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SBooleanType o : input) { + public Set convertFromSSetObjectAdded(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SObjectAdded o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListBooleanType(Collection input) { - List result = new ArrayList(); - for (BooleanType o : input) { + public List convertToSListObjectAdded(Collection input) { + List result = new ArrayList(); + for (ObjectAdded o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListBooleanType(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SBooleanType o : input) { + public List convertFromSListObjectAdded(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SObjectAdded o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SBooleanType convertToSObject(BooleanType input) { + public SObjectAdded convertToSObject(ObjectAdded input) { if (input == null) { return null; } - SBooleanType result = new SBooleanType(); + SObjectAdded result = new SObjectAdded(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setValue(input.isValue()); + DataObject dataObjectVal = input.getDataObject(); + result.setDataObject(convertToSObject(dataObjectVal)); return result; } - public BooleanType convertFromSObject(SBooleanType input, DatabaseSession session) throws BimserverDatabaseException { + public ObjectAdded convertFromSObject(SObjectAdded input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - BooleanType result = convertFromSObject(input, StoreFactory.eINSTANCE.createBooleanType(), session); + ObjectAdded result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectAdded(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -6220,73 +6368,70 @@ public BooleanType convertFromSObject(SBooleanType input, DatabaseSession sessio return result; } - public BooleanType convertFromSObject(SBooleanType input) throws BimserverDatabaseException { - BooleanType result = convertFromSObject(input, StoreFactory.eINSTANCE.createBooleanType(), null); + public ObjectAdded convertFromSObject(SObjectAdded input) throws BimserverDatabaseException { + ObjectAdded result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectAdded(), null); return result; } - public BooleanType convertFromSObject(SBooleanType input, BooleanType result, DatabaseSession session) throws BimserverDatabaseException { + public ObjectAdded convertFromSObject(SObjectAdded input, ObjectAdded result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setValue(input.isValue()); + result.setDataObject(convertFromSObject(input.getDataObject(), session)); return result; } - public Set convertToSSetArrayType(Collection input) { - Set result = new HashSet(); - for (ArrayType o : input) { + public Set convertToSSetObjectRemoved(Collection input) { + Set result = new HashSet(); + for (ObjectRemoved o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetArrayType(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SArrayType o : input) { + public Set convertFromSSetObjectRemoved(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SObjectRemoved o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListArrayType(Collection input) { - List result = new ArrayList(); - for (ArrayType o : input) { + public List convertToSListObjectRemoved(Collection input) { + List result = new ArrayList(); + for (ObjectRemoved o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListArrayType(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SArrayType o : input) { + public List convertFromSListObjectRemoved(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SObjectRemoved o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SArrayType convertToSObject(ArrayType input) { + public SObjectRemoved convertToSObject(ObjectRemoved input) { if (input == null) { return null; } - SArrayType result = new SArrayType(); + SObjectRemoved result = new SObjectRemoved(); result.setOid(input.getOid()); result.setRid(input.getRid()); - List listvalues = new ArrayList(); - for (Type v : input.getValues()) { - listvalues.add(convertToSObject(v)); - } - result.setValues(listvalues); + DataObject dataObjectVal = input.getDataObject(); + result.setDataObject(convertToSObject(dataObjectVal)); return result; } - public ArrayType convertFromSObject(SArrayType input, DatabaseSession session) throws BimserverDatabaseException { + public ObjectRemoved convertFromSObject(SObjectRemoved input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ArrayType result = convertFromSObject(input, StoreFactory.eINSTANCE.createArrayType(), session); + ObjectRemoved result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectRemoved(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -6294,75 +6439,73 @@ public ArrayType convertFromSObject(SArrayType input, DatabaseSession session) t return result; } - public ArrayType convertFromSObject(SArrayType input) throws BimserverDatabaseException { - ArrayType result = convertFromSObject(input, StoreFactory.eINSTANCE.createArrayType(), null); + public ObjectRemoved convertFromSObject(SObjectRemoved input) throws BimserverDatabaseException { + ObjectRemoved result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectRemoved(), null); return result; } - public ArrayType convertFromSObject(SArrayType input, ArrayType result, DatabaseSession session) throws BimserverDatabaseException { + public ObjectRemoved convertFromSObject(SObjectRemoved input, ObjectRemoved result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - List listvalues = result.getValues(); - for (SType v : input.getValues()) { - listvalues.add(convertFromSObject(v, session)); - } + result.setDataObject(convertFromSObject(input.getDataObject(), session)); return result; } - public Set convertToSSetParameter(Collection input) { - Set result = new HashSet(); - for (Parameter o : input) { + public Set convertToSSetObjectModified(Collection input) { + Set result = new HashSet(); + for (ObjectModified o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetParameter(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SParameter o : input) { + public Set convertFromSSetObjectModified(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SObjectModified o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListParameter(Collection input) { - List result = new ArrayList(); - for (Parameter o : input) { + public List convertToSListObjectModified(Collection input) { + List result = new ArrayList(); + for (ObjectModified o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListParameter(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SParameter o : input) { + public List convertFromSListObjectModified(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SObjectModified o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SParameter convertToSObject(Parameter input) { + public SObjectModified convertToSObject(ObjectModified input) { if (input == null) { return null; } - SParameter result = new SParameter(); + SObjectModified result = new SObjectModified(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setIdentifier(input.getIdentifier()); - result.setName(input.getName()); - Type valueVal = input.getValue(); - result.setValue(convertToSObject(valueVal)); + result.setFieldName(input.getFieldName()); + result.setOldValue(input.getOldValue()); + result.setNewValue(input.getNewValue()); + DataObject dataObjectVal = input.getDataObject(); + result.setDataObject(convertToSObject(dataObjectVal)); return result; } - public Parameter convertFromSObject(SParameter input, DatabaseSession session) throws BimserverDatabaseException { + public ObjectModified convertFromSObject(SObjectModified input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - Parameter result = convertFromSObject(input, StoreFactory.eINSTANCE.createParameter(), session); + ObjectModified result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectModified(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -6370,79 +6513,77 @@ public Parameter convertFromSObject(SParameter input, DatabaseSession session) t return result; } - public Parameter convertFromSObject(SParameter input) throws BimserverDatabaseException { - Parameter result = convertFromSObject(input, StoreFactory.eINSTANCE.createParameter(), null); + public ObjectModified convertFromSObject(SObjectModified input) throws BimserverDatabaseException { + ObjectModified result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectModified(), null); return result; } - public Parameter convertFromSObject(SParameter input, Parameter result, DatabaseSession session) throws BimserverDatabaseException { + public ObjectModified convertFromSObject(SObjectModified input, ObjectModified result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setIdentifier(input.getIdentifier()); - result.setName(input.getName()); - result.setValue(convertFromSObject(input.getValue(), session)); + result.setFieldName(input.getFieldName()); + result.setOldValue(input.getOldValue()); + result.setNewValue(input.getNewValue()); + result.setDataObject(convertFromSObject(input.getDataObject(), session)); return result; } - public SNotifictionResultEnum convertToSObject(NotifictionResultEnum input) { - return SNotifictionResultEnum.values()[input.ordinal()]; - } - - public NotifictionResultEnum convertFromSObject(SNotifictionResultEnum input) { - return NotifictionResultEnum.values()[input.ordinal()]; - } - public Set convertToSSetImmediateNotificationResult(Collection input) { - Set result = new HashSet(); - for (ImmediateNotificationResult o : input) { + public Set convertToSSetCompareContainer(Collection input) { + Set result = new HashSet(); + for (CompareContainer o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetImmediateNotificationResult(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SImmediateNotificationResult o : input) { + public Set convertFromSSetCompareContainer(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SCompareContainer o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListImmediateNotificationResult(Collection input) { - List result = new ArrayList(); - for (ImmediateNotificationResult o : input) { + public List convertToSListCompareContainer(Collection input) { + List result = new ArrayList(); + for (CompareContainer o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListImmediateNotificationResult(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SImmediateNotificationResult o : input) { + public List convertFromSListCompareContainer(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SCompareContainer o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SImmediateNotificationResult convertToSObject(ImmediateNotificationResult input) { + public SCompareContainer convertToSObject(CompareContainer input) { if (input == null) { return null; } - SImmediateNotificationResult result = new SImmediateNotificationResult(); + SCompareContainer result = new SCompareContainer(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setResult(SNotifictionResultEnum.values()[input.getResult().ordinal()]); - result.setDescription(input.getDescription()); + result.setType(input.getType()); + List listitems = new ArrayList(); + for (CompareItem v : input.getItems()) { + listitems.add(convertToSObject(v)); + } + result.setItems(listitems); return result; } - public ImmediateNotificationResult convertFromSObject(SImmediateNotificationResult input, DatabaseSession session) throws BimserverDatabaseException { + public CompareContainer convertFromSObject(SCompareContainer input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ImmediateNotificationResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createImmediateNotificationResult(), session); + CompareContainer result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareContainer(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -6450,72 +6591,77 @@ public ImmediateNotificationResult convertFromSObject(SImmediateNotificationResu return result; } - public ImmediateNotificationResult convertFromSObject(SImmediateNotificationResult input) throws BimserverDatabaseException { - ImmediateNotificationResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createImmediateNotificationResult(), null); + public CompareContainer convertFromSObject(SCompareContainer input) throws BimserverDatabaseException { + CompareContainer result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareContainer(), null); return result; } - public ImmediateNotificationResult convertFromSObject(SImmediateNotificationResult input, ImmediateNotificationResult result, DatabaseSession session) throws BimserverDatabaseException { + public CompareContainer convertFromSObject(SCompareContainer input, CompareContainer result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setResult(NotifictionResultEnum.values()[input.getResult().ordinal()]); - result.setDescription(input.getDescription()); + result.setType(input.getType()); + List listitems = result.getItems(); + for (SCompareItem v : input.getItems()) { + listitems.add(convertFromSObject(v, session)); + } return result; } - public Set convertToSSetRemoteServiceUpdate(Collection input) { - Set result = new HashSet(); - for (RemoteServiceUpdate o : input) { + public Set convertToSSetCompareResult(Collection input) { + Set result = new HashSet(); + for (CompareResult o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetRemoteServiceUpdate(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SRemoteServiceUpdate o : input) { + public Set convertFromSSetCompareResult(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SCompareResult o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListRemoteServiceUpdate(Collection input) { - List result = new ArrayList(); - for (RemoteServiceUpdate o : input) { + public List convertToSListCompareResult(Collection input) { + List result = new ArrayList(); + for (CompareResult o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListRemoteServiceUpdate(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SRemoteServiceUpdate o : input) { + public List convertFromSListCompareResult(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SCompareResult o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SRemoteServiceUpdate convertToSObject(RemoteServiceUpdate input) { + public SCompareResult convertToSObject(CompareResult input) { if (input == null) { return null; } - if (input instanceof PercentageChange) { - return convertToSObject((PercentageChange)input); - } - SRemoteServiceUpdate result = new SRemoteServiceUpdate(); + SCompareResult result = new SCompareResult(); result.setOid(input.getOid()); result.setRid(input.getRid()); + List listitems = new ArrayList(); + for (CompareContainer v : input.getItems()) { + listitems.add(convertToSObject(v)); + } + result.setItems(listitems); return result; } - public RemoteServiceUpdate convertFromSObject(SRemoteServiceUpdate input, DatabaseSession session) throws BimserverDatabaseException { + public CompareResult convertFromSObject(SCompareResult input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - RemoteServiceUpdate result = convertFromSObject(input, StoreFactory.eINSTANCE.createRemoteServiceUpdate(), session); + CompareResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareResult(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -6523,71 +6669,87 @@ public RemoteServiceUpdate convertFromSObject(SRemoteServiceUpdate input, Databa return result; } - public RemoteServiceUpdate convertFromSObject(SRemoteServiceUpdate input) throws BimserverDatabaseException { - RemoteServiceUpdate result = convertFromSObject(input, StoreFactory.eINSTANCE.createRemoteServiceUpdate(), null); + public CompareResult convertFromSObject(SCompareResult input) throws BimserverDatabaseException { + CompareResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createCompareResult(), null); return result; } - public RemoteServiceUpdate convertFromSObject(SRemoteServiceUpdate input, RemoteServiceUpdate result, DatabaseSession session) throws BimserverDatabaseException { + public CompareResult convertFromSObject(SCompareResult input, CompareResult result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - if (input instanceof SPercentageChange) { - return convertFromSObject((SPercentageChange)input, session); + List listitems = result.getItems(); + for (SCompareContainer v : input.getItems()) { + listitems.add(convertFromSObject(v, session)); } return result; } + public SActionState convertToSObject(ActionState input) { + return SActionState.values()[input.ordinal()]; + } + + public ActionState convertFromSObject(SActionState input) { + return ActionState.values()[input.ordinal()]; + } - public Set convertToSSetPercentageChange(Collection input) { - Set result = new HashSet(); - for (PercentageChange o : input) { + public Set convertToSSetLongActionState(Collection input) { + Set result = new HashSet(); + for (LongActionState o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetPercentageChange(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SPercentageChange o : input) { + public Set convertFromSSetLongActionState(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SLongActionState o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListPercentageChange(Collection input) { - List result = new ArrayList(); - for (PercentageChange o : input) { + public List convertToSListLongActionState(Collection input) { + List result = new ArrayList(); + for (LongActionState o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListPercentageChange(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SPercentageChange o : input) { + public List convertFromSListLongActionState(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SLongActionState o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SPercentageChange convertToSObject(PercentageChange input) { + public SLongActionState convertToSObject(LongActionState input) { if (input == null) { return null; } - SPercentageChange result = new SPercentageChange(); + SLongActionState result = new SLongActionState(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setPercentage(input.getPercentage()); + result.setStart(input.getStart()); + result.setEnd(input.getEnd()); + result.setProgress(input.getProgress()); + result.setState(SActionState.values()[input.getState().ordinal()]); + result.setTitle(input.getTitle()); + result.setStage(input.getStage()); + result.getErrors().addAll(input.getErrors()); + result.getWarnings().addAll(input.getWarnings()); + result.getInfos().addAll(input.getInfos()); return result; } - public PercentageChange convertFromSObject(SPercentageChange input, DatabaseSession session) throws BimserverDatabaseException { + public LongActionState convertFromSObject(SLongActionState input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - PercentageChange result = convertFromSObject(input, StoreFactory.eINSTANCE.createPercentageChange(), session); + LongActionState result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongActionState(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -6595,75 +6757,87 @@ public PercentageChange convertFromSObject(SPercentageChange input, DatabaseSess return result; } - public PercentageChange convertFromSObject(SPercentageChange input) throws BimserverDatabaseException { - PercentageChange result = convertFromSObject(input, StoreFactory.eINSTANCE.createPercentageChange(), null); + public LongActionState convertFromSObject(SLongActionState input) throws BimserverDatabaseException { + LongActionState result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongActionState(), null); return result; } - public PercentageChange convertFromSObject(SPercentageChange input, PercentageChange result, DatabaseSession session) throws BimserverDatabaseException { + public LongActionState convertFromSObject(SLongActionState input, LongActionState result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setPercentage(input.getPercentage()); + result.setStart(input.getStart()); + result.setEnd(input.getEnd()); + result.setProgress(input.getProgress()); + result.setState(ActionState.values()[input.getState().ordinal()]); + result.setTitle(input.getTitle()); + result.setStage(input.getStage()); + result.getErrors().addAll(input.getErrors()); + result.getWarnings().addAll(input.getWarnings()); + result.getInfos().addAll(input.getInfos()); return result; } + public SServerState convertToSObject(ServerState input) { + return SServerState.values()[input.ordinal()]; + } + + public ServerState convertFromSObject(SServerState input) { + return ServerState.values()[input.ordinal()]; + } - public Set convertToSSetSystemInfo(Collection input) { - Set result = new HashSet(); - for (SystemInfo o : input) { + public Set convertToSSetServerInfo(Collection input) { + Set result = new HashSet(); + for (ServerInfo o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetSystemInfo(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SSystemInfo o : input) { + public Set convertFromSSetServerInfo(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SServerInfo o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListSystemInfo(Collection input) { - List result = new ArrayList(); - for (SystemInfo o : input) { + public List convertToSListServerInfo(Collection input) { + List result = new ArrayList(); + for (ServerInfo o : input) { result.add(convertToSObject(o)); } return result; - } - - public List convertFromSListSystemInfo(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SSystemInfo o : input) { + } + + public List convertFromSListServerInfo(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SServerInfo o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SSystemInfo convertToSObject(SystemInfo input) { + public SServerInfo convertToSObject(ServerInfo input) { if (input == null) { return null; } - SSystemInfo result = new SSystemInfo(); + SServerInfo result = new SServerInfo(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setCpucores(input.getCpucores()); - result.setDatetime(input.getDatetime()); - result.setOsname(input.getOsname()); - result.setOsversion(input.getOsversion()); - result.setUserName(input.getUserName()); - result.setUserHome(input.getUserHome()); - result.setUserDir(input.getUserDir()); + result.setServerState(SServerState.values()[input.getServerState().ordinal()]); + result.setErrorMessage(input.getErrorMessage()); + Version versionVal = input.getVersion(); + result.setVersion(convertToSObject(versionVal)); return result; } - public SystemInfo convertFromSObject(SSystemInfo input, DatabaseSession session) throws BimserverDatabaseException { + public ServerInfo convertFromSObject(SServerInfo input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - SystemInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createSystemInfo(), session); + ServerInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createServerInfo(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -6671,97 +6845,78 @@ public SystemInfo convertFromSObject(SSystemInfo input, DatabaseSession session) return result; } - public SystemInfo convertFromSObject(SSystemInfo input) throws BimserverDatabaseException { - SystemInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createSystemInfo(), null); + public ServerInfo convertFromSObject(SServerInfo input) throws BimserverDatabaseException { + ServerInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createServerInfo(), null); return result; } - public SystemInfo convertFromSObject(SSystemInfo input, SystemInfo result, DatabaseSession session) throws BimserverDatabaseException { + public ServerInfo convertFromSObject(SServerInfo input, ServerInfo result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setCpucores(input.getCpucores()); - result.setDatetime(input.getDatetime()); - result.setOsname(input.getOsname()); - result.setOsversion(input.getOsversion()); - result.setUserName(input.getUserName()); - result.setUserHome(input.getUserHome()); - result.setUserDir(input.getUserDir()); + result.setServerState(ServerState.values()[input.getServerState().ordinal()]); + result.setErrorMessage(input.getErrorMessage()); + result.setVersion(convertFromSObject(input.getVersion(), session)); return result; } - public Set convertToSSetJavaInfo(Collection input) { - Set result = new HashSet(); - for (JavaInfo o : input) { + public Set convertToSSetVersion(Collection input) { + Set result = new HashSet(); + for (Version o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetJavaInfo(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SJavaInfo o : input) { + public Set convertFromSSetVersion(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SVersion o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListJavaInfo(Collection input) { - List result = new ArrayList(); - for (JavaInfo o : input) { + public List convertToSListVersion(Collection input) { + List result = new ArrayList(); + for (Version o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListJavaInfo(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SJavaInfo o : input) { + public List convertFromSListVersion(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SVersion o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SJavaInfo convertToSObject(JavaInfo input) { + public SVersion convertToSObject(Version input) { if (input == null) { return null; } - SJavaInfo result = new SJavaInfo(); + SVersion result = new SVersion(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setHeapTotal(input.getHeapTotal()); - result.setHeapUsed(input.getHeapUsed()); - result.setHeapFree(input.getHeapFree()); - result.setHeapMax(input.getHeapMax()); - result.setThreads(input.getThreads()); - result.setJavaHome(input.getJavaHome()); - result.setJavaVersion(input.getJavaVersion()); - result.setJavaVendor(input.getJavaVendor()); - result.setJavaVendorurl(input.getJavaVendorurl()); - result.setJavavmVersion(input.getJavavmVersion()); - result.setJavavmVendor(input.getJavavmVendor()); - result.setJavavmName(input.getJavavmName()); - result.setJavaspecVersion(input.getJavaspecVersion()); - result.setJavaspecVendor(input.getJavaspecVendor()); - result.setJavaspecName(input.getJavaspecName()); - result.setJavaClassVersion(input.getJavaClassVersion()); - result.getJavaClasspath().addAll(input.getJavaClasspath()); - result.getJavaLibrarypath().addAll(input.getJavaLibrarypath()); - result.setJavaIoTmp(input.getJavaIoTmp()); - result.setJavaExtdir(input.getJavaExtdir()); - result.setJavaFileSeparator(input.getJavaFileSeparator()); - result.setJavaPathSeparator(input.getJavaPathSeparator()); - result.setJavaLineSeparator(input.getJavaLineSeparator()); + result.setMajor(input.getMajor()); + result.setMinor(input.getMinor()); + result.setRevision(input.getRevision()); + result.setFullString(input.getFullString()); + result.setDate(input.getDate()); + result.setDownloadUrl(input.getDownloadUrl()); + result.setSupportUrl(input.getSupportUrl()); + result.setSupportEmail(input.getSupportEmail()); return result; } - public JavaInfo convertFromSObject(SJavaInfo input, DatabaseSession session) throws BimserverDatabaseException { + public Version convertFromSObject(SVersion input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - JavaInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createJavaInfo(), session); + Version result = convertFromSObject(input, StoreFactory.eINSTANCE.createVersion(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -6769,101 +6924,79 @@ public JavaInfo convertFromSObject(SJavaInfo input, DatabaseSession session) thr return result; } - public JavaInfo convertFromSObject(SJavaInfo input) throws BimserverDatabaseException { - JavaInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createJavaInfo(), null); + public Version convertFromSObject(SVersion input) throws BimserverDatabaseException { + Version result = convertFromSObject(input, StoreFactory.eINSTANCE.createVersion(), null); return result; } - public JavaInfo convertFromSObject(SJavaInfo input, JavaInfo result, DatabaseSession session) throws BimserverDatabaseException { + public Version convertFromSObject(SVersion input, Version result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setHeapTotal(input.getHeapTotal()); - result.setHeapUsed(input.getHeapUsed()); - result.setHeapFree(input.getHeapFree()); - result.setHeapMax(input.getHeapMax()); - result.setThreads(input.getThreads()); - result.setJavaHome(input.getJavaHome()); - result.setJavaVersion(input.getJavaVersion()); - result.setJavaVendor(input.getJavaVendor()); - result.setJavaVendorurl(input.getJavaVendorurl()); - result.setJavavmVersion(input.getJavavmVersion()); - result.setJavavmVendor(input.getJavavmVendor()); - result.setJavavmName(input.getJavavmName()); - result.setJavaspecVersion(input.getJavaspecVersion()); - result.setJavaspecVendor(input.getJavaspecVendor()); - result.setJavaspecName(input.getJavaspecName()); - result.setJavaClassVersion(input.getJavaClassVersion()); - result.getJavaClasspath().addAll(input.getJavaClasspath()); - result.getJavaLibrarypath().addAll(input.getJavaLibrarypath()); - result.setJavaIoTmp(input.getJavaIoTmp()); - result.setJavaExtdir(input.getJavaExtdir()); - result.setJavaFileSeparator(input.getJavaFileSeparator()); - result.setJavaPathSeparator(input.getJavaPathSeparator()); - result.setJavaLineSeparator(input.getJavaLineSeparator()); + result.setMajor(input.getMajor()); + result.setMinor(input.getMinor()); + result.setRevision(input.getRevision()); + result.setFullString(input.getFullString()); + result.setDate(input.getDate()); + result.setDownloadUrl(input.getDownloadUrl()); + result.setSupportUrl(input.getSupportUrl()); + result.setSupportEmail(input.getSupportEmail()); return result; } - public Set convertToSSetBimServerInfo(Collection input) { - Set result = new HashSet(); - for (BimServerInfo o : input) { + public Set convertToSSetFile(Collection input) { + Set result = new HashSet(); + for (File o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetBimServerInfo(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SBimServerInfo o : input) { + public Set convertFromSSetFile(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SFile o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListBimServerInfo(Collection input) { - List result = new ArrayList(); - for (BimServerInfo o : input) { + public List convertToSListFile(Collection input) { + List result = new ArrayList(); + for (File o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListBimServerInfo(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SBimServerInfo o : input) { + public List convertFromSListFile(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SFile o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SBimServerInfo convertToSObject(BimServerInfo input) { + public SFile convertToSObject(File input) { if (input == null) { return null; } - SBimServerInfo result = new SBimServerInfo(); + SFile result = new SFile(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setCurrentVersion(input.getCurrentVersion()); - result.setCurrentDate(input.getCurrentDate()); - result.setSchemaVersion(input.getSchemaVersion()); - result.setLatestDate(input.getLatestDate()); - result.setLatestVersion(input.getLatestVersion()); - result.setProjects(input.getProjects()); - result.setRevisions(input.getRevisions()); - result.setUsers(input.getUsers()); - result.setCheckouts(input.getCheckouts()); - result.setServerLogUrl(input.getServerLogUrl()); - result.setStarted(input.getStarted()); + result.setData(input.getData()); + result.setFilename(input.getFilename()); + result.setMime(input.getMime()); + result.setSize(input.getSize()); return result; } - public BimServerInfo convertFromSObject(SBimServerInfo input, DatabaseSession session) throws BimserverDatabaseException { + public File convertFromSObject(SFile input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - BimServerInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createBimServerInfo(), session); + File result = convertFromSObject(input, StoreFactory.eINSTANCE.createFile(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -6871,93 +7004,88 @@ public BimServerInfo convertFromSObject(SBimServerInfo input, DatabaseSession se return result; } - public BimServerInfo convertFromSObject(SBimServerInfo input) throws BimserverDatabaseException { - BimServerInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createBimServerInfo(), null); + public File convertFromSObject(SFile input) throws BimserverDatabaseException { + File result = convertFromSObject(input, StoreFactory.eINSTANCE.createFile(), null); return result; } - public BimServerInfo convertFromSObject(SBimServerInfo input, BimServerInfo result, DatabaseSession session) throws BimserverDatabaseException { + public File convertFromSObject(SFile input, File result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setCurrentVersion(input.getCurrentVersion()); - result.setCurrentDate(input.getCurrentDate()); - result.setSchemaVersion(input.getSchemaVersion()); - result.setLatestDate(input.getLatestDate()); - result.setLatestVersion(input.getLatestVersion()); - result.setProjects(input.getProjects()); - result.setRevisions(input.getRevisions()); - result.setUsers(input.getUsers()); - result.setCheckouts(input.getCheckouts()); - result.setServerLogUrl(input.getServerLogUrl()); - result.setStarted(input.getStarted()); + result.setData(input.getData()); + result.setFilename(input.getFilename()); + result.setMime(input.getMime()); + result.setSize(input.getSize()); return result; } - public SProgressTopicType convertToSObject(ProgressTopicType input) { - return SProgressTopicType.values()[input.ordinal()]; - } - - public ProgressTopicType convertFromSObject(SProgressTopicType input) { - return ProgressTopicType.values()[input.ordinal()]; - } - public Set convertToSSetProjectSmall(Collection input) { - Set result = new HashSet(); - for (ProjectSmall o : input) { + public Set convertToSSetExtendedDataSchema(Collection input) { + Set result = new HashSet(); + for (ExtendedDataSchema o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetProjectSmall(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SProjectSmall o : input) { + public Set convertFromSSetExtendedDataSchema(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SExtendedDataSchema o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListProjectSmall(Collection input) { - List result = new ArrayList(); - for (ProjectSmall o : input) { + public List convertToSListExtendedDataSchema(Collection input) { + List result = new ArrayList(); + for (ExtendedDataSchema o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListProjectSmall(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SProjectSmall o : input) { + public List convertFromSListExtendedDataSchema(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SExtendedDataSchema o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SProjectSmall convertToSObject(ProjectSmall input) { + public SExtendedDataSchema convertToSObject(ExtendedDataSchema input) { if (input == null) { return null; } - - SProjectSmall result = new SProjectSmall(); - result.setOid(input.getOid()); - result.setRid(input.getRid()); - result.setName(input.getName()); - result.setParentId(input.getParentId()); - result.setState(SObjectState.values()[input.getState().ordinal()]); - result.setNrRevisions(input.getNrRevisions()); - result.setNrSubProjects(input.getNrSubProjects()); - result.setHasCheckinRights(input.isHasCheckinRights()); - result.setLastRevisionId(input.getLastRevisionId()); - result.setSchema(input.getSchema()); + + SExtendedDataSchema result = new SExtendedDataSchema(); + result.setOid(input.getOid()); + result.setRid(input.getRid()); + result.setName(input.getName()); + result.setUrl(input.getUrl()); + result.setContentType(input.getContentType()); + result.setDescription(input.getDescription()); + result.setSize(input.getSize()); + File fileVal = input.getFile(); + result.setFileId(fileVal == null ? -1 : fileVal.getOid()); + List listusers = new ArrayList(); + for (User v : input.getUsers()) { + listusers.add(v.getOid()); + } + result.setUsers(listusers); + List listextendedData = new ArrayList(); + for (ExtendedData v : input.getExtendedData()) { + listextendedData.add(v.getOid()); + } + result.setExtendedData(listextendedData); return result; } - public ProjectSmall convertFromSObject(SProjectSmall input, DatabaseSession session) throws BimserverDatabaseException { + public ExtendedDataSchema convertFromSObject(SExtendedDataSchema input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ProjectSmall result = convertFromSObject(input, StoreFactory.eINSTANCE.createProjectSmall(), session); + ExtendedDataSchema result = convertFromSObject(input, StoreFactory.eINSTANCE.createExtendedDataSchema(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -6965,85 +7093,95 @@ public ProjectSmall convertFromSObject(SProjectSmall input, DatabaseSession sess return result; } - public ProjectSmall convertFromSObject(SProjectSmall input) throws BimserverDatabaseException { - ProjectSmall result = convertFromSObject(input, StoreFactory.eINSTANCE.createProjectSmall(), null); + public ExtendedDataSchema convertFromSObject(SExtendedDataSchema input) throws BimserverDatabaseException { + ExtendedDataSchema result = convertFromSObject(input, StoreFactory.eINSTANCE.createExtendedDataSchema(), null); return result; } - public ProjectSmall convertFromSObject(SProjectSmall input, ProjectSmall result, DatabaseSession session) throws BimserverDatabaseException { + public ExtendedDataSchema convertFromSObject(SExtendedDataSchema input, ExtendedDataSchema result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } result.setName(input.getName()); - result.setParentId(input.getParentId()); - result.setState(ObjectState.values()[input.getState().ordinal()]); - result.setNrRevisions(input.getNrRevisions()); - result.setNrSubProjects(input.getNrSubProjects()); - result.setHasCheckinRights(input.isHasCheckinRights()); - result.setLastRevisionId(input.getLastRevisionId()); - result.setSchema(input.getSchema()); + result.setUrl(input.getUrl()); + result.setContentType(input.getContentType()); + result.setDescription(input.getDescription()); + result.setSize(input.getSize()); + result.setFile((File)session.get(StorePackage.eINSTANCE.getFile(), input.getFileId(), OldQuery.getDefault())); + List listusers = result.getUsers(); + for (long oid : input.getUsers()) { + listusers.add((User)session.get(StorePackage.eINSTANCE.getUser(), oid, OldQuery.getDefault())); + } + List listextendedData = result.getExtendedData(); + for (long oid : input.getExtendedData()) { + listextendedData.add((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), oid, OldQuery.getDefault())); + } return result; } - public Set convertToSSetIfcHeader(Collection input) { - Set result = new HashSet(); - for (IfcHeader o : input) { + public Set convertToSSetExtendedData(Collection input) { + Set result = new HashSet(); + for (ExtendedData o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetIfcHeader(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SIfcHeader o : input) { + public Set convertFromSSetExtendedData(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SExtendedData o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListIfcHeader(Collection input) { - List result = new ArrayList(); - for (IfcHeader o : input) { + public List convertToSListExtendedData(Collection input) { + List result = new ArrayList(); + for (ExtendedData o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListIfcHeader(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SIfcHeader o : input) { + public List convertFromSListExtendedData(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SExtendedData o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SIfcHeader convertToSObject(IfcHeader input) { + public SExtendedData convertToSObject(ExtendedData input) { if (input == null) { return null; } - SIfcHeader result = new SIfcHeader(); + SExtendedData result = new SExtendedData(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.getDescription().addAll(input.getDescription()); - result.setImplementationLevel(input.getImplementationLevel()); - result.setFilename(input.getFilename()); - result.setTimeStamp(input.getTimeStamp()); - result.getAuthor().addAll(input.getAuthor()); - result.getOrganization().addAll(input.getOrganization()); - result.setPreProcessorVersion(input.getPreProcessorVersion()); - result.setOriginatingSystem(input.getOriginatingSystem()); - result.setIfcSchemaVersion(input.getIfcSchemaVersion()); - result.setAuthorization(input.getAuthorization()); + result.setUrl(input.getUrl()); + result.setSize(input.getSize()); + result.setTitle(input.getTitle()); + result.setAdded(input.getAdded()); + File fileVal = input.getFile(); + result.setFileId(fileVal == null ? -1 : fileVal.getOid()); + User userVal = input.getUser(); + result.setUserId(userVal == null ? -1 : userVal.getOid()); + ExtendedDataSchema schemaVal = input.getSchema(); + result.setSchemaId(schemaVal == null ? -1 : schemaVal.getOid()); + Revision revisionVal = input.getRevision(); + result.setRevisionId(revisionVal == null ? -1 : revisionVal.getOid()); + Project projectVal = input.getProject(); + result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); return result; } - public IfcHeader convertFromSObject(SIfcHeader input, DatabaseSession session) throws BimserverDatabaseException { + public ExtendedData convertFromSObject(SExtendedData input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - IfcHeader result = convertFromSObject(input, StoreFactory.eINSTANCE.createIfcHeader(), session); + ExtendedData result = convertFromSObject(input, StoreFactory.eINSTANCE.createExtendedData(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -7051,83 +7189,85 @@ public IfcHeader convertFromSObject(SIfcHeader input, DatabaseSession session) t return result; } - public IfcHeader convertFromSObject(SIfcHeader input) throws BimserverDatabaseException { - IfcHeader result = convertFromSObject(input, StoreFactory.eINSTANCE.createIfcHeader(), null); + public ExtendedData convertFromSObject(SExtendedData input) throws BimserverDatabaseException { + ExtendedData result = convertFromSObject(input, StoreFactory.eINSTANCE.createExtendedData(), null); return result; } - public IfcHeader convertFromSObject(SIfcHeader input, IfcHeader result, DatabaseSession session) throws BimserverDatabaseException { + public ExtendedData convertFromSObject(SExtendedData input, ExtendedData result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.getDescription().addAll(input.getDescription()); - result.setImplementationLevel(input.getImplementationLevel()); - result.setFilename(input.getFilename()); - result.setTimeStamp(input.getTimeStamp()); - result.getAuthor().addAll(input.getAuthor()); - result.getOrganization().addAll(input.getOrganization()); - result.setPreProcessorVersion(input.getPreProcessorVersion()); - result.setOriginatingSystem(input.getOriginatingSystem()); - result.setIfcSchemaVersion(input.getIfcSchemaVersion()); - result.setAuthorization(input.getAuthorization()); + result.setUrl(input.getUrl()); + result.setSize(input.getSize()); + result.setTitle(input.getTitle()); + result.setAdded(input.getAdded()); + result.setFile((File)session.get(StorePackage.eINSTANCE.getFile(), input.getFileId(), OldQuery.getDefault())); + result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); + result.setSchema((ExtendedDataSchema)session.get(StorePackage.eINSTANCE.getExtendedDataSchema(), input.getSchemaId(), OldQuery.getDefault())); + result.setRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getRevisionId(), OldQuery.getDefault())); + result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); return result; } - public Set convertToSSetModelCheckerResultItem(Collection input) { - Set result = new HashSet(); - for (ModelCheckerResultItem o : input) { + public Set convertToSSetQueryEnginePluginConfiguration(Collection input) { + Set result = new HashSet(); + for (QueryEnginePluginConfiguration o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetModelCheckerResultItem(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SModelCheckerResultItem o : input) { + public Set convertFromSSetQueryEnginePluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SQueryEnginePluginConfiguration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListModelCheckerResultItem(Collection input) { - List result = new ArrayList(); - for (ModelCheckerResultItem o : input) { + public List convertToSListQueryEnginePluginConfiguration(Collection input) { + List result = new ArrayList(); + for (QueryEnginePluginConfiguration o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListModelCheckerResultItem(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SModelCheckerResultItem o : input) { + public List convertFromSListQueryEnginePluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SQueryEnginePluginConfiguration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SModelCheckerResultItem convertToSObject(ModelCheckerResultItem input) { + public SQueryEnginePluginConfiguration convertToSObject(QueryEnginePluginConfiguration input) { if (input == null) { return null; } - if (input instanceof ModelCheckerResultHeader) { - return convertToSObject((ModelCheckerResultHeader)input); - } - else if (input instanceof ModelCheckerResultLine) { - return convertToSObject((ModelCheckerResultLine)input); - } - SModelCheckerResultItem result = new SModelCheckerResultItem(); + SQueryEnginePluginConfiguration result = new SQueryEnginePluginConfiguration(); result.setOid(input.getOid()); result.setRid(input.getRid()); + result.setName(input.getName()); + result.setEnabled(input.getEnabled()); + result.setDescription(input.getDescription()); + PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor(); + result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid()); + ObjectType settingsVal = input.getSettings(); + result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid()); + UserSettings userSettingsVal = input.getUserSettings(); + result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid()); return result; } - public ModelCheckerResultItem convertFromSObject(SModelCheckerResultItem input, DatabaseSession session) throws BimserverDatabaseException { + public QueryEnginePluginConfiguration convertFromSObject(SQueryEnginePluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ModelCheckerResultItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultItem(), session); + QueryEnginePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createQueryEnginePluginConfiguration(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -7135,74 +7275,82 @@ public ModelCheckerResultItem convertFromSObject(SModelCheckerResultItem input, return result; } - public ModelCheckerResultItem convertFromSObject(SModelCheckerResultItem input) throws BimserverDatabaseException { - ModelCheckerResultItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultItem(), null); + public QueryEnginePluginConfiguration convertFromSObject(SQueryEnginePluginConfiguration input) throws BimserverDatabaseException { + QueryEnginePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createQueryEnginePluginConfiguration(), null); return result; } - public ModelCheckerResultItem convertFromSObject(SModelCheckerResultItem input, ModelCheckerResultItem result, DatabaseSession session) throws BimserverDatabaseException { + public QueryEnginePluginConfiguration convertFromSObject(SQueryEnginePluginConfiguration input, QueryEnginePluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - if (input instanceof SModelCheckerResultHeader) { - return convertFromSObject((SModelCheckerResultHeader)input, session); - } - else if (input instanceof SModelCheckerResultLine) { - return convertFromSObject((SModelCheckerResultLine)input, session); - } + result.setName(input.getName()); + result.setEnabled(input.getEnabled()); + result.setDescription(input.getDescription()); + result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault())); + result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault())); + result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault())); return result; } - public Set convertToSSetModelCheckerResultHeader(Collection input) { - Set result = new HashSet(); - for (ModelCheckerResultHeader o : input) { + public Set convertToSSetWebModulePluginConfiguration(Collection input) { + Set result = new HashSet(); + for (WebModulePluginConfiguration o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetModelCheckerResultHeader(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SModelCheckerResultHeader o : input) { + public Set convertFromSSetWebModulePluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SWebModulePluginConfiguration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListModelCheckerResultHeader(Collection input) { - List result = new ArrayList(); - for (ModelCheckerResultHeader o : input) { + public List convertToSListWebModulePluginConfiguration(Collection input) { + List result = new ArrayList(); + for (WebModulePluginConfiguration o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListModelCheckerResultHeader(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SModelCheckerResultHeader o : input) { + public List convertFromSListWebModulePluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SWebModulePluginConfiguration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SModelCheckerResultHeader convertToSObject(ModelCheckerResultHeader input) { + public SWebModulePluginConfiguration convertToSObject(WebModulePluginConfiguration input) { if (input == null) { return null; } - SModelCheckerResultHeader result = new SModelCheckerResultHeader(); + SWebModulePluginConfiguration result = new SWebModulePluginConfiguration(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setText(input.getText()); + result.setName(input.getName()); + result.setEnabled(input.getEnabled()); + result.setDescription(input.getDescription()); + PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor(); + result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid()); + ObjectType settingsVal = input.getSettings(); + result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid()); + ServerSettings serverSettingsVal = input.getServerSettings(); + result.setServerSettingsId(serverSettingsVal == null ? -1 : serverSettingsVal.getOid()); return result; } - public ModelCheckerResultHeader convertFromSObject(SModelCheckerResultHeader input, DatabaseSession session) throws BimserverDatabaseException { + public WebModulePluginConfiguration convertFromSObject(SWebModulePluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ModelCheckerResultHeader result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultHeader(), session); + WebModulePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createWebModulePluginConfiguration(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -7210,80 +7358,82 @@ public ModelCheckerResultHeader convertFromSObject(SModelCheckerResultHeader inp return result; } - public ModelCheckerResultHeader convertFromSObject(SModelCheckerResultHeader input) throws BimserverDatabaseException { - ModelCheckerResultHeader result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultHeader(), null); + public WebModulePluginConfiguration convertFromSObject(SWebModulePluginConfiguration input) throws BimserverDatabaseException { + WebModulePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createWebModulePluginConfiguration(), null); return result; } - public ModelCheckerResultHeader convertFromSObject(SModelCheckerResultHeader input, ModelCheckerResultHeader result, DatabaseSession session) throws BimserverDatabaseException { + public WebModulePluginConfiguration convertFromSObject(SWebModulePluginConfiguration input, WebModulePluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setText(input.getText()); - return result; - } - public SModelCheckerResultType convertToSObject(ModelCheckerResultType input) { - return SModelCheckerResultType.values()[input.ordinal()]; - } - - public ModelCheckerResultType convertFromSObject(SModelCheckerResultType input) { - return ModelCheckerResultType.values()[input.ordinal()]; - } + result.setName(input.getName()); + result.setEnabled(input.getEnabled()); + result.setDescription(input.getDescription()); + result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault())); + result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault())); + result.setServerSettings((ServerSettings)session.get(StorePackage.eINSTANCE.getServerSettings(), input.getServerSettingsId(), OldQuery.getDefault())); + return result; + } - public Set convertToSSetModelCheckerResultLine(Collection input) { - Set result = new HashSet(); - for (ModelCheckerResultLine o : input) { + public Set convertToSSetModelMergerPluginConfiguration(Collection input) { + Set result = new HashSet(); + for (ModelMergerPluginConfiguration o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetModelCheckerResultLine(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SModelCheckerResultLine o : input) { + public Set convertFromSSetModelMergerPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SModelMergerPluginConfiguration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListModelCheckerResultLine(Collection input) { - List result = new ArrayList(); - for (ModelCheckerResultLine o : input) { + public List convertToSListModelMergerPluginConfiguration(Collection input) { + List result = new ArrayList(); + for (ModelMergerPluginConfiguration o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListModelCheckerResultLine(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SModelCheckerResultLine o : input) { + public List convertFromSListModelMergerPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SModelMergerPluginConfiguration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SModelCheckerResultLine convertToSObject(ModelCheckerResultLine input) { + public SModelMergerPluginConfiguration convertToSObject(ModelMergerPluginConfiguration input) { if (input == null) { return null; } - SModelCheckerResultLine result = new SModelCheckerResultLine(); + SModelMergerPluginConfiguration result = new SModelMergerPluginConfiguration(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setFieldOrClass(input.getFieldOrClass()); - result.setValue(input.getValue()); - result.setShouldBe(input.getShouldBe()); - result.setType(SModelCheckerResultType.values()[input.getType().ordinal()]); - result.setObjectId(input.getObjectId()); + result.setName(input.getName()); + result.setEnabled(input.getEnabled()); + result.setDescription(input.getDescription()); + PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor(); + result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid()); + ObjectType settingsVal = input.getSettings(); + result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid()); + UserSettings userSettingsVal = input.getUserSettings(); + result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid()); return result; } - public ModelCheckerResultLine convertFromSObject(SModelCheckerResultLine input, DatabaseSession session) throws BimserverDatabaseException { + public ModelMergerPluginConfiguration convertFromSObject(SModelMergerPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ModelCheckerResultLine result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultLine(), session); + ModelMergerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelMergerPluginConfiguration(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -7291,78 +7441,82 @@ public ModelCheckerResultLine convertFromSObject(SModelCheckerResultLine input, return result; } - public ModelCheckerResultLine convertFromSObject(SModelCheckerResultLine input) throws BimserverDatabaseException { - ModelCheckerResultLine result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultLine(), null); + public ModelMergerPluginConfiguration convertFromSObject(SModelMergerPluginConfiguration input) throws BimserverDatabaseException { + ModelMergerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelMergerPluginConfiguration(), null); return result; } - public ModelCheckerResultLine convertFromSObject(SModelCheckerResultLine input, ModelCheckerResultLine result, DatabaseSession session) throws BimserverDatabaseException { + public ModelMergerPluginConfiguration convertFromSObject(SModelMergerPluginConfiguration input, ModelMergerPluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setFieldOrClass(input.getFieldOrClass()); - result.setValue(input.getValue()); - result.setShouldBe(input.getShouldBe()); - result.setType(ModelCheckerResultType.values()[input.getType().ordinal()]); - result.setObjectId(input.getObjectId()); + result.setName(input.getName()); + result.setEnabled(input.getEnabled()); + result.setDescription(input.getDescription()); + result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault())); + result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault())); + result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault())); return result; } - public Set convertToSSetModelCheckerResult(Collection input) { - Set result = new HashSet(); - for (ModelCheckerResult o : input) { + public Set convertToSSetModelComparePluginConfiguration(Collection input) { + Set result = new HashSet(); + for (ModelComparePluginConfiguration o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetModelCheckerResult(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SModelCheckerResult o : input) { + public Set convertFromSSetModelComparePluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SModelComparePluginConfiguration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListModelCheckerResult(Collection input) { - List result = new ArrayList(); - for (ModelCheckerResult o : input) { + public List convertToSListModelComparePluginConfiguration(Collection input) { + List result = new ArrayList(); + for (ModelComparePluginConfiguration o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListModelCheckerResult(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SModelCheckerResult o : input) { + public List convertFromSListModelComparePluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SModelComparePluginConfiguration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SModelCheckerResult convertToSObject(ModelCheckerResult input) { + public SModelComparePluginConfiguration convertToSObject(ModelComparePluginConfiguration input) { if (input == null) { return null; } - SModelCheckerResult result = new SModelCheckerResult(); + SModelComparePluginConfiguration result = new SModelComparePluginConfiguration(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setValid(input.isValid()); - List listitems = new ArrayList(); - for (ModelCheckerResultItem v : input.getItems()) { - listitems.add(v.getOid()); - } - result.setItems(listitems); + result.setName(input.getName()); + result.setEnabled(input.getEnabled()); + result.setDescription(input.getDescription()); + PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor(); + result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid()); + ObjectType settingsVal = input.getSettings(); + result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid()); + UserSettings userSettingsVal = input.getUserSettings(); + result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid()); return result; } - public ModelCheckerResult convertFromSObject(SModelCheckerResult input, DatabaseSession session) throws BimserverDatabaseException { + public ModelComparePluginConfiguration convertFromSObject(SModelComparePluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ModelCheckerResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResult(), session); + ModelComparePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelComparePluginConfiguration(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -7370,255 +7524,279 @@ public ModelCheckerResult convertFromSObject(SModelCheckerResult input, Database return result; } - public ModelCheckerResult convertFromSObject(SModelCheckerResult input) throws BimserverDatabaseException { - ModelCheckerResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResult(), null); + public ModelComparePluginConfiguration convertFromSObject(SModelComparePluginConfiguration input) throws BimserverDatabaseException { + ModelComparePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelComparePluginConfiguration(), null); return result; } - public ModelCheckerResult convertFromSObject(SModelCheckerResult input, ModelCheckerResult result, DatabaseSession session) throws BimserverDatabaseException { + public ModelComparePluginConfiguration convertFromSObject(SModelComparePluginConfiguration input, ModelComparePluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setValid(input.isValid()); - List listitems = result.getItems(); - for (long oid : input.getItems()) { - listitems.add((ModelCheckerResultItem)session.get(StorePackage.eINSTANCE.getModelCheckerResultItem(), oid, OldQuery.getDefault())); - } + result.setName(input.getName()); + result.setEnabled(input.getEnabled()); + result.setDescription(input.getDescription()); + result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault())); + result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault())); + result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault())); return result; } + public STrigger convertToSObject(Trigger input) { + return STrigger.values()[input.ordinal()]; + } + + public Trigger convertFromSObject(STrigger input) { + return Trigger.values()[input.ordinal()]; + } - public Set convertToSSetModelCheckerInstance(Collection input) { - Set result = new HashSet(); - for (ModelCheckerInstance o : input) { + public Set convertToSSetProfileDescriptor(Collection input) { + Set result = new HashSet(); + for (ProfileDescriptor o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetModelCheckerInstance(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SModelCheckerInstance o : input) { + public Set convertFromSSetProfileDescriptor(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SProfileDescriptor o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListModelCheckerInstance(Collection input) { - List result = new ArrayList(); - for (ModelCheckerInstance o : input) { + public List convertToSListProfileDescriptor(Collection input) { + List result = new ArrayList(); + for (ProfileDescriptor o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListModelCheckerInstance(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SModelCheckerInstance o : input) { + public List convertFromSListProfileDescriptor(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SProfileDescriptor o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SModelCheckerInstance convertToSObject(ModelCheckerInstance input) { + public SProfileDescriptor convertToSObject(ProfileDescriptor input) { if (input == null) { return null; } - SModelCheckerInstance result = new SModelCheckerInstance(); - result.setOid(input.getOid()); - result.setRid(input.getRid()); + SProfileDescriptor result = new SProfileDescriptor(); result.setName(input.getName()); result.setDescription(input.getDescription()); - result.setCode(input.getCode()); - result.setCompiled(input.getCompiled()); - result.setValid(input.isValid()); - result.setModelCheckerPluginClassName(input.getModelCheckerPluginClassName()); + result.setPublicProfile(input.isPublicProfile()); + result.setIdentifier(input.getIdentifier()); return result; } - public ModelCheckerInstance convertFromSObject(SModelCheckerInstance input, DatabaseSession session) throws BimserverDatabaseException { + public ProfileDescriptor convertFromSObject(SProfileDescriptor input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ModelCheckerInstance result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerInstance(), session); - - ((IdEObjectImpl)result).setOid(input.getOid()); - ((IdEObjectImpl)result).setRid(input.getRid()); + ProfileDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createProfileDescriptor(), session); return result; } - public ModelCheckerInstance convertFromSObject(SModelCheckerInstance input) throws BimserverDatabaseException { - ModelCheckerInstance result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerInstance(), null); + public ProfileDescriptor convertFromSObject(SProfileDescriptor input) throws BimserverDatabaseException { + ProfileDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createProfileDescriptor(), null); return result; } - public ModelCheckerInstance convertFromSObject(SModelCheckerInstance input, ModelCheckerInstance result, DatabaseSession session) throws BimserverDatabaseException { + public ProfileDescriptor convertFromSObject(SProfileDescriptor input, ProfileDescriptor result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } result.setName(input.getName()); result.setDescription(input.getDescription()); - result.setCode(input.getCode()); - result.setCompiled(input.getCompiled()); - result.setValid(input.isValid()); - result.setModelCheckerPluginClassName(input.getModelCheckerPluginClassName()); + result.setPublicProfile(input.isPublicProfile()); + result.setIdentifier(input.getIdentifier()); return result; } - public SSmtpProtocol convertToSObject(SmtpProtocol input) { - return SSmtpProtocol.values()[input.ordinal()]; - } - - public SmtpProtocol convertFromSObject(SSmtpProtocol input) { - return SmtpProtocol.values()[input.ordinal()]; - } - public Set convertToSSetMessagingSerializerPluginConfiguration(Collection input) { - Set result = new HashSet(); - for (MessagingSerializerPluginConfiguration o : input) { + public Set convertToSSetServiceDescriptor(Collection input) { + Set result = new HashSet(); + for (ServiceDescriptor o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetMessagingSerializerPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SMessagingSerializerPluginConfiguration o : input) { + public Set convertFromSSetServiceDescriptor(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SServiceDescriptor o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListMessagingSerializerPluginConfiguration(Collection input) { - List result = new ArrayList(); - for (MessagingSerializerPluginConfiguration o : input) { + public List convertToSListServiceDescriptor(Collection input) { + List result = new ArrayList(); + for (ServiceDescriptor o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListMessagingSerializerPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SMessagingSerializerPluginConfiguration o : input) { + public List convertFromSListServiceDescriptor(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SServiceDescriptor o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SMessagingSerializerPluginConfiguration convertToSObject(MessagingSerializerPluginConfiguration input) { + public SServiceDescriptor convertToSObject(ServiceDescriptor input) { if (input == null) { return null; } - SMessagingSerializerPluginConfiguration result = new SMessagingSerializerPluginConfiguration(); - result.setOid(input.getOid()); - result.setRid(input.getRid()); + SServiceDescriptor result = new SServiceDescriptor(); result.setName(input.getName()); - result.setEnabled(input.getEnabled()); + result.setUrl(input.getUrl()); + result.setToken(input.getToken()); + result.setIdentifier(input.getIdentifier()); + result.setNotificationProtocol(SAccessMethod.values()[input.getNotificationProtocol().ordinal()]); result.setDescription(input.getDescription()); - result.setStreaming(input.isStreaming()); - PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor(); - result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid()); - ObjectType settingsVal = input.getSettings(); - result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid()); - ObjectIDMPluginConfiguration objectIDMVal = input.getObjectIDM(); - result.setObjectIDMId(objectIDMVal == null ? -1 : objectIDMVal.getOid()); - UserSettings userSettingsVal = input.getUserSettings(); - result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid()); - RenderEnginePluginConfiguration renderEngineVal = input.getRenderEngine(); - result.setRenderEngineId(renderEngineVal == null ? -1 : renderEngineVal.getOid()); + result.setTrigger(STrigger.values()[input.getTrigger().ordinal()]); + result.setReadRevision(input.isReadRevision()); + result.setReadExtendedData(input.getReadExtendedData()); + result.setWriteRevision(input.isWriteRevision()); + result.setWriteExtendedData(input.getWriteExtendedData()); + result.setProviderName(input.getProviderName()); + result.setCompanyUrl(input.getCompanyUrl()); + result.setTokenUrl(input.getTokenUrl()); + result.setNewProfileUrl(input.getNewProfileUrl()); + result.setRegisterUrl(input.getRegisterUrl()); + result.setAuthorizeUrl(input.getAuthorizeUrl()); return result; } - public MessagingSerializerPluginConfiguration convertFromSObject(SMessagingSerializerPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException { + public ServiceDescriptor convertFromSObject(SServiceDescriptor input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - MessagingSerializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createMessagingSerializerPluginConfiguration(), session); - - ((IdEObjectImpl)result).setOid(input.getOid()); - ((IdEObjectImpl)result).setRid(input.getRid()); + ServiceDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceDescriptor(), session); return result; } - public MessagingSerializerPluginConfiguration convertFromSObject(SMessagingSerializerPluginConfiguration input) throws BimserverDatabaseException { - MessagingSerializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createMessagingSerializerPluginConfiguration(), null); + public ServiceDescriptor convertFromSObject(SServiceDescriptor input) throws BimserverDatabaseException { + ServiceDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceDescriptor(), null); return result; } - public MessagingSerializerPluginConfiguration convertFromSObject(SMessagingSerializerPluginConfiguration input, MessagingSerializerPluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException { + public ServiceDescriptor convertFromSObject(SServiceDescriptor input, ServiceDescriptor result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } result.setName(input.getName()); - result.setEnabled(input.getEnabled()); + result.setUrl(input.getUrl()); + result.setToken(input.getToken()); + result.setIdentifier(input.getIdentifier()); + result.setNotificationProtocol(AccessMethod.values()[input.getNotificationProtocol().ordinal()]); result.setDescription(input.getDescription()); - result.setStreaming(input.isStreaming()); - result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault())); - result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault())); - result.setObjectIDM((ObjectIDMPluginConfiguration)session.get(StorePackage.eINSTANCE.getObjectIDMPluginConfiguration(), input.getObjectIDMId(), OldQuery.getDefault())); - result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault())); - result.setRenderEngine((RenderEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getRenderEnginePluginConfiguration(), input.getRenderEngineId(), OldQuery.getDefault())); + result.setTrigger(Trigger.values()[input.getTrigger().ordinal()]); + result.setReadRevision(input.isReadRevision()); + result.setReadExtendedData(input.getReadExtendedData()); + result.setWriteRevision(input.isWriteRevision()); + result.setWriteExtendedData(input.getWriteExtendedData()); + result.setProviderName(input.getProviderName()); + result.setCompanyUrl(input.getCompanyUrl()); + result.setTokenUrl(input.getTokenUrl()); + result.setNewProfileUrl(input.getNewProfileUrl()); + result.setRegisterUrl(input.getRegisterUrl()); + result.setAuthorizeUrl(input.getAuthorizeUrl()); return result; } - public Set convertToSSetMetrics(Collection input) { - Set result = new HashSet(); - for (Metrics o : input) { + public Set convertToSSetService(Collection input) { + Set result = new HashSet(); + for (Service o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetMetrics(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SMetrics o : input) { + public Set convertFromSSetService(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SService o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListMetrics(Collection input) { - List result = new ArrayList(); - for (Metrics o : input) { + public List convertToSListService(Collection input) { + List result = new ArrayList(); + for (Service o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListMetrics(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SMetrics o : input) { + public List convertFromSListService(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SService o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SMetrics convertToSObject(Metrics input) { + public SService convertToSObject(Service input) { if (input == null) { return null; } - SMetrics result = new SMetrics(); + SService result = new SService(); result.setOid(input.getOid()); result.setRid(input.getRid()); - List listinterfaces = new ArrayList(); - for (InterfaceMetric v : input.getInterfaces()) { - listinterfaces.add(convertToSObject(v)); + result.setName(input.getName()); + result.setServiceName(input.getServiceName()); + result.setServiceIdentifier(input.getServiceIdentifier()); + result.setProviderName(input.getProviderName()); + result.setUrl(input.getUrl()); + result.setToken(input.getToken()); + result.setNotificationProtocol(SAccessMethod.values()[input.getNotificationProtocol().ordinal()]); + result.setDescription(input.getDescription()); + result.setTrigger(STrigger.values()[input.getTrigger().ordinal()]); + result.setReadRevision(input.isReadRevision()); + result.setProfileIdentifier(input.getProfileIdentifier()); + result.setProfileName(input.getProfileName()); + result.setProfileDescription(input.getProfileDescription()); + result.setProfilePublic(input.isProfilePublic()); + ExtendedDataSchema readExtendedDataVal = input.getReadExtendedData(); + result.setReadExtendedDataId(readExtendedDataVal == null ? -1 : readExtendedDataVal.getOid()); + Project writeRevisionVal = input.getWriteRevision(); + result.setWriteRevisionId(writeRevisionVal == null ? -1 : writeRevisionVal.getOid()); + ExtendedDataSchema writeExtendedDataVal = input.getWriteExtendedData(); + result.setWriteExtendedDataId(writeExtendedDataVal == null ? -1 : writeExtendedDataVal.getOid()); + Project projectVal = input.getProject(); + result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); + User userVal = input.getUser(); + result.setUserId(userVal == null ? -1 : userVal.getOid()); + InternalServicePluginConfiguration internalServiceVal = input.getInternalService(); + result.setInternalServiceId(internalServiceVal == null ? -1 : internalServiceVal.getOid()); + List listmodelCheckers = new ArrayList(); + for (ModelCheckerInstance v : input.getModelCheckers()) { + listmodelCheckers.add(v.getOid()); } - result.setInterfaces(listinterfaces); + result.setModelCheckers(listmodelCheckers); return result; } - public Metrics convertFromSObject(SMetrics input, DatabaseSession session) throws BimserverDatabaseException { + public Service convertFromSObject(SService input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - Metrics result = convertFromSObject(input, StoreFactory.eINSTANCE.createMetrics(), session); + Service result = convertFromSObject(input, StoreFactory.eINSTANCE.createService(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -7626,77 +7804,93 @@ public Metrics convertFromSObject(SMetrics input, DatabaseSession session) throw return result; } - public Metrics convertFromSObject(SMetrics input) throws BimserverDatabaseException { - Metrics result = convertFromSObject(input, StoreFactory.eINSTANCE.createMetrics(), null); + public Service convertFromSObject(SService input) throws BimserverDatabaseException { + Service result = convertFromSObject(input, StoreFactory.eINSTANCE.createService(), null); return result; } - public Metrics convertFromSObject(SMetrics input, Metrics result, DatabaseSession session) throws BimserverDatabaseException { + public Service convertFromSObject(SService input, Service result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - List listinterfaces = result.getInterfaces(); - for (SInterfaceMetric v : input.getInterfaces()) { - listinterfaces.add(convertFromSObject(v, session)); + result.setName(input.getName()); + result.setServiceName(input.getServiceName()); + result.setServiceIdentifier(input.getServiceIdentifier()); + result.setProviderName(input.getProviderName()); + result.setUrl(input.getUrl()); + result.setToken(input.getToken()); + result.setNotificationProtocol(AccessMethod.values()[input.getNotificationProtocol().ordinal()]); + result.setDescription(input.getDescription()); + result.setTrigger(Trigger.values()[input.getTrigger().ordinal()]); + result.setReadRevision(input.isReadRevision()); + result.setProfileIdentifier(input.getProfileIdentifier()); + result.setProfileName(input.getProfileName()); + result.setProfileDescription(input.getProfileDescription()); + result.setProfilePublic(input.isProfilePublic()); + result.setReadExtendedData((ExtendedDataSchema)session.get(StorePackage.eINSTANCE.getExtendedDataSchema(), input.getReadExtendedDataId(), OldQuery.getDefault())); + result.setWriteRevision((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getWriteRevisionId(), OldQuery.getDefault())); + result.setWriteExtendedData((ExtendedDataSchema)session.get(StorePackage.eINSTANCE.getExtendedDataSchema(), input.getWriteExtendedDataId(), OldQuery.getDefault())); + result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); + result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); + result.setInternalService((InternalServicePluginConfiguration)session.get(StorePackage.eINSTANCE.getInternalServicePluginConfiguration(), input.getInternalServiceId(), OldQuery.getDefault())); + List listmodelCheckers = result.getModelCheckers(); + for (long oid : input.getModelCheckers()) { + listmodelCheckers.add((ModelCheckerInstance)session.get(StorePackage.eINSTANCE.getModelCheckerInstance(), oid, OldQuery.getDefault())); } return result; } - public Set convertToSSetInterfaceMetric(Collection input) { - Set result = new HashSet(); - for (InterfaceMetric o : input) { + public Set convertToSSetToken(Collection input) { + Set result = new HashSet(); + for (Token o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetInterfaceMetric(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SInterfaceMetric o : input) { + public Set convertFromSSetToken(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SToken o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListInterfaceMetric(Collection input) { - List result = new ArrayList(); - for (InterfaceMetric o : input) { + public List convertToSListToken(Collection input) { + List result = new ArrayList(); + for (Token o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListInterfaceMetric(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SInterfaceMetric o : input) { + public List convertFromSListToken(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SToken o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SInterfaceMetric convertToSObject(InterfaceMetric input) { + public SToken convertToSObject(Token input) { if (input == null) { return null; } - SInterfaceMetric result = new SInterfaceMetric(); + SToken result = new SToken(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setName(input.getName()); - List listmethods = new ArrayList(); - for (MethodMetric v : input.getMethods()) { - listmethods.add(convertToSObject(v)); - } - result.setMethods(listmethods); + result.setTokenString(input.getTokenString()); + result.setExpires(input.getExpires()); return result; } - public InterfaceMetric convertFromSObject(SInterfaceMetric input, DatabaseSession session) throws BimserverDatabaseException { + public Token convertFromSObject(SToken input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - InterfaceMetric result = convertFromSObject(input, StoreFactory.eINSTANCE.createInterfaceMetric(), session); + Token result = convertFromSObject(input, StoreFactory.eINSTANCE.createToken(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -7704,78 +7898,80 @@ public InterfaceMetric convertFromSObject(SInterfaceMetric input, DatabaseSessio return result; } - public InterfaceMetric convertFromSObject(SInterfaceMetric input) throws BimserverDatabaseException { - InterfaceMetric result = convertFromSObject(input, StoreFactory.eINSTANCE.createInterfaceMetric(), null); + public Token convertFromSObject(SToken input) throws BimserverDatabaseException { + Token result = convertFromSObject(input, StoreFactory.eINSTANCE.createToken(), null); return result; } - public InterfaceMetric convertFromSObject(SInterfaceMetric input, InterfaceMetric result, DatabaseSession session) throws BimserverDatabaseException { + public Token convertFromSObject(SToken input, Token result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setName(input.getName()); - List listmethods = result.getMethods(); - for (SMethodMetric v : input.getMethods()) { - listmethods.add(convertFromSObject(v, session)); - } + result.setTokenString(input.getTokenString()); + result.setExpires(input.getExpires()); return result; } - public Set convertToSSetMethodMetric(Collection input) { - Set result = new HashSet(); - for (MethodMetric o : input) { + public Set convertToSSetInternalServicePluginConfiguration(Collection input) { + Set result = new HashSet(); + for (InternalServicePluginConfiguration o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetMethodMetric(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SMethodMetric o : input) { + public Set convertFromSSetInternalServicePluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SInternalServicePluginConfiguration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListMethodMetric(Collection input) { - List result = new ArrayList(); - for (MethodMetric o : input) { + public List convertToSListInternalServicePluginConfiguration(Collection input) { + List result = new ArrayList(); + for (InternalServicePluginConfiguration o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListMethodMetric(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SMethodMetric o : input) { + public List convertFromSListInternalServicePluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SInternalServicePluginConfiguration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SMethodMetric convertToSObject(MethodMetric input) { + public SInternalServicePluginConfiguration convertToSObject(InternalServicePluginConfiguration input) { if (input == null) { return null; } - SMethodMetric result = new SMethodMetric(); + SInternalServicePluginConfiguration result = new SInternalServicePluginConfiguration(); result.setOid(input.getOid()); result.setRid(input.getRid()); result.setName(input.getName()); - result.setNrCalls(input.getNrCalls()); - result.setLastCall(input.getLastCall()); - result.setAverageMs(input.getAverageMs()); - result.setShortestMs(input.getShortestMs()); - result.setLongestMs(input.getLongestMs()); + result.setEnabled(input.getEnabled()); + result.setDescription(input.getDescription()); + result.setRemoteAccessible(input.isRemoteAccessible()); + result.setPublicProfile(input.isPublicProfile()); + PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor(); + result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid()); + ObjectType settingsVal = input.getSettings(); + result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid()); + UserSettings userSettingsVal = input.getUserSettings(); + result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid()); return result; } - public MethodMetric convertFromSObject(SMethodMetric input, DatabaseSession session) throws BimserverDatabaseException { + public InternalServicePluginConfiguration convertFromSObject(SInternalServicePluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - MethodMetric result = convertFromSObject(input, StoreFactory.eINSTANCE.createMethodMetric(), session); + InternalServicePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createInternalServicePluginConfiguration(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -7783,359 +7979,301 @@ public MethodMetric convertFromSObject(SMethodMetric input, DatabaseSession sess return result; } - public MethodMetric convertFromSObject(SMethodMetric input) throws BimserverDatabaseException { - MethodMetric result = convertFromSObject(input, StoreFactory.eINSTANCE.createMethodMetric(), null); + public InternalServicePluginConfiguration convertFromSObject(SInternalServicePluginConfiguration input) throws BimserverDatabaseException { + InternalServicePluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createInternalServicePluginConfiguration(), null); return result; } - public MethodMetric convertFromSObject(SMethodMetric input, MethodMetric result, DatabaseSession session) throws BimserverDatabaseException { + public InternalServicePluginConfiguration convertFromSObject(SInternalServicePluginConfiguration input, InternalServicePluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } result.setName(input.getName()); - result.setNrCalls(input.getNrCalls()); - result.setLastCall(input.getLastCall()); - result.setAverageMs(input.getAverageMs()); - result.setShortestMs(input.getShortestMs()); - result.setLongestMs(input.getLongestMs()); + result.setEnabled(input.getEnabled()); + result.setDescription(input.getDescription()); + result.setRemoteAccessible(input.isRemoteAccessible()); + result.setPublicProfile(input.isPublicProfile()); + result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault())); + result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault())); + result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault())); return result; } - - public Set convertToSSetPluginBundleVersion(Collection input) { - Set result = new HashSet(); - for (PluginBundleVersion o : input) { + + public Set convertToSSetServiceInterface(Collection input) { + Set result = new HashSet(); + for (ServiceInterface o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetPluginBundleVersion(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SPluginBundleVersion o : input) { + public Set convertFromSSetServiceInterface(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SServiceInterface o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListPluginBundleVersion(Collection input) { - List result = new ArrayList(); - for (PluginBundleVersion o : input) { + public List convertToSListServiceInterface(Collection input) { + List result = new ArrayList(); + for (ServiceInterface o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListPluginBundleVersion(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SPluginBundleVersion o : input) { + public List convertFromSListServiceInterface(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SServiceInterface o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SPluginBundleVersion convertToSObject(PluginBundleVersion input) { + public SServiceInterface convertToSObject(ServiceInterface input) { if (input == null) { return null; } - SPluginBundleVersion result = new SPluginBundleVersion(); - result.setOid(input.getOid()); - result.setRid(input.getRid()); - result.setVersion(input.getVersion()); - result.setType(SPluginBundleType.values()[input.getType().ordinal()]); - result.setDescription(input.getDescription()); - result.setMismatch(input.isMismatch()); - result.setRepository(input.getRepository()); - result.setGroupId(input.getGroupId()); - result.setArtifactId(input.getArtifactId()); - result.setIcon(input.getIcon()); - result.setOrganization(input.getOrganization()); + SServiceInterface result = new SServiceInterface(); result.setName(input.getName()); - result.setDate(input.getDate()); + result.setNameSpace(input.getNameSpace()); + result.setSimpleName(input.getSimpleName()); return result; } - public PluginBundleVersion convertFromSObject(SPluginBundleVersion input, DatabaseSession session) throws BimserverDatabaseException { + public ServiceInterface convertFromSObject(SServiceInterface input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - PluginBundleVersion result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginBundleVersion(), session); - - ((IdEObjectImpl)result).setOid(input.getOid()); - ((IdEObjectImpl)result).setRid(input.getRid()); + ServiceInterface result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceInterface(), session); return result; } - public PluginBundleVersion convertFromSObject(SPluginBundleVersion input) throws BimserverDatabaseException { - PluginBundleVersion result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginBundleVersion(), null); + public ServiceInterface convertFromSObject(SServiceInterface input) throws BimserverDatabaseException { + ServiceInterface result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceInterface(), null); return result; } - public PluginBundleVersion convertFromSObject(SPluginBundleVersion input, PluginBundleVersion result, DatabaseSession session) throws BimserverDatabaseException { + public ServiceInterface convertFromSObject(SServiceInterface input, ServiceInterface result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setVersion(input.getVersion()); - result.setType(PluginBundleType.values()[input.getType().ordinal()]); - result.setDescription(input.getDescription()); - result.setMismatch(input.isMismatch()); - result.setRepository(input.getRepository()); - result.setGroupId(input.getGroupId()); - result.setArtifactId(input.getArtifactId()); - result.setIcon(input.getIcon()); - result.setOrganization(input.getOrganization()); result.setName(input.getName()); - result.setDate(input.getDate()); + result.setNameSpace(input.getNameSpace()); + result.setSimpleName(input.getSimpleName()); return result; } - public SPluginBundleType convertToSObject(PluginBundleType input) { - return SPluginBundleType.values()[input.ordinal()]; - } - - public PluginBundleType convertFromSObject(SPluginBundleType input) { - return PluginBundleType.values()[input.ordinal()]; - } - public SPluginType convertToSObject(PluginType input) { - return SPluginType.values()[input.ordinal()]; - } - - public PluginType convertFromSObject(SPluginType input) { - return PluginType.values()[input.ordinal()]; - } - public Set convertToSSetPluginBundle(Collection input) { - Set result = new HashSet(); - for (PluginBundle o : input) { + public Set convertToSSetServiceMethod(Collection input) { + Set result = new HashSet(); + for (ServiceMethod o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetPluginBundle(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SPluginBundle o : input) { + public Set convertFromSSetServiceMethod(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SServiceMethod o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListPluginBundle(Collection input) { - List result = new ArrayList(); - for (PluginBundle o : input) { + public List convertToSListServiceMethod(Collection input) { + List result = new ArrayList(); + for (ServiceMethod o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListPluginBundle(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SPluginBundle o : input) { + public List convertFromSListServiceMethod(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SServiceMethod o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SPluginBundle convertToSObject(PluginBundle input) { + public SServiceMethod convertToSObject(ServiceMethod input) { if (input == null) { return null; } - SPluginBundle result = new SPluginBundle(); - result.setOid(input.getOid()); - result.setRid(input.getRid()); - result.setOrganization(input.getOrganization()); + SServiceMethod result = new SServiceMethod(); result.setName(input.getName()); - PluginBundleVersion latestVersionVal = input.getLatestVersion(); - result.setLatestVersion(convertToSObject(latestVersionVal)); - List listavailableVersions = new ArrayList(); - for (PluginBundleVersion v : input.getAvailableVersions()) { - listavailableVersions.add(convertToSObject(v)); - } - result.setAvailableVersions(listavailableVersions); - PluginBundleVersion installedVersionVal = input.getInstalledVersion(); - result.setInstalledVersion(convertToSObject(installedVersionVal)); + result.setDoc(input.getDoc()); + result.setReturnDoc(input.getReturnDoc()); return result; } - public PluginBundle convertFromSObject(SPluginBundle input, DatabaseSession session) throws BimserverDatabaseException { + public ServiceMethod convertFromSObject(SServiceMethod input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - PluginBundle result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginBundle(), session); - - ((IdEObjectImpl)result).setOid(input.getOid()); - ((IdEObjectImpl)result).setRid(input.getRid()); + ServiceMethod result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceMethod(), session); return result; } - public PluginBundle convertFromSObject(SPluginBundle input) throws BimserverDatabaseException { - PluginBundle result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginBundle(), null); + public ServiceMethod convertFromSObject(SServiceMethod input) throws BimserverDatabaseException { + ServiceMethod result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceMethod(), null); return result; } - public PluginBundle convertFromSObject(SPluginBundle input, PluginBundle result, DatabaseSession session) throws BimserverDatabaseException { + public ServiceMethod convertFromSObject(SServiceMethod input, ServiceMethod result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setOrganization(input.getOrganization()); result.setName(input.getName()); - result.setLatestVersion(convertFromSObject(input.getLatestVersion(), session)); - List listavailableVersions = result.getAvailableVersions(); - for (SPluginBundleVersion v : input.getAvailableVersions()) { - listavailableVersions.add(convertFromSObject(v, session)); - } - result.setInstalledVersion(convertFromSObject(input.getInstalledVersion(), session)); + result.setDoc(input.getDoc()); + result.setReturnDoc(input.getReturnDoc()); return result; } + public SServiceSimpleType convertToSObject(ServiceSimpleType input) { + return SServiceSimpleType.values()[input.ordinal()]; + } + + public ServiceSimpleType convertFromSObject(SServiceSimpleType input) { + return ServiceSimpleType.values()[input.ordinal()]; + } - public Set convertToSSetPluginInformation(Collection input) { - Set result = new HashSet(); - for (PluginInformation o : input) { + public Set convertToSSetServiceField(Collection input) { + Set result = new HashSet(); + for (ServiceField o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetPluginInformation(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SPluginInformation o : input) { + public Set convertFromSSetServiceField(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SServiceField o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListPluginInformation(Collection input) { - List result = new ArrayList(); - for (PluginInformation o : input) { + public List convertToSListServiceField(Collection input) { + List result = new ArrayList(); + for (ServiceField o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListPluginInformation(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SPluginInformation o : input) { + public List convertFromSListServiceField(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SServiceField o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SPluginInformation convertToSObject(PluginInformation input) { + public SServiceField convertToSObject(ServiceField input) { if (input == null) { return null; } - SPluginInformation result = new SPluginInformation(); - result.setOid(input.getOid()); - result.setRid(input.getRid()); + SServiceField result = new SServiceField(); result.setName(input.getName()); - result.setType(SPluginType.values()[input.getType().ordinal()]); - result.setDescription(input.getDescription()); - result.setEnabled(input.isEnabled()); - result.setIdentifier(input.getIdentifier()); - result.setInstallForAllUsers(input.isInstallForAllUsers()); - result.setInstallForNewUsers(input.isInstallForNewUsers()); + result.setDoc(input.getDoc()); + ServiceType typeVal = input.getType(); + result.setType(convertToSObject(typeVal)); + ServiceType genericTypeVal = input.getGenericType(); + result.setGenericType(convertToSObject(genericTypeVal)); return result; } - public PluginInformation convertFromSObject(SPluginInformation input, DatabaseSession session) throws BimserverDatabaseException { + public ServiceField convertFromSObject(SServiceField input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - PluginInformation result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginInformation(), session); - - ((IdEObjectImpl)result).setOid(input.getOid()); - ((IdEObjectImpl)result).setRid(input.getRid()); + ServiceField result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceField(), session); return result; } - public PluginInformation convertFromSObject(SPluginInformation input) throws BimserverDatabaseException { - PluginInformation result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginInformation(), null); + public ServiceField convertFromSObject(SServiceField input) throws BimserverDatabaseException { + ServiceField result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceField(), null); return result; } - public PluginInformation convertFromSObject(SPluginInformation input, PluginInformation result, DatabaseSession session) throws BimserverDatabaseException { + public ServiceField convertFromSObject(SServiceField input, ServiceField result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } result.setName(input.getName()); - result.setType(PluginType.values()[input.getType().ordinal()]); - result.setDescription(input.getDescription()); - result.setEnabled(input.isEnabled()); - result.setIdentifier(input.getIdentifier()); - result.setInstallForAllUsers(input.isInstallForAllUsers()); - result.setInstallForNewUsers(input.isInstallForNewUsers()); + result.setDoc(input.getDoc()); + result.setType(convertFromSObject(input.getType(), session)); + result.setGenericType(convertFromSObject(input.getGenericType(), session)); return result; } - public Set convertToSSetOAuthServer(Collection input) { - Set result = new HashSet(); - for (OAuthServer o : input) { + public Set convertToSSetServiceType(Collection input) { + Set result = new HashSet(); + for (ServiceType o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetOAuthServer(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SOAuthServer o : input) { + public Set convertFromSSetServiceType(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SServiceType o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListOAuthServer(Collection input) { - List result = new ArrayList(); - for (OAuthServer o : input) { + public List convertToSListServiceType(Collection input) { + List result = new ArrayList(); + for (ServiceType o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListOAuthServer(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SOAuthServer o : input) { + public List convertFromSListServiceType(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SServiceType o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SOAuthServer convertToSObject(OAuthServer input) { + public SServiceType convertToSObject(ServiceType input) { if (input == null) { return null; } - - SOAuthServer result = new SOAuthServer(); - result.setOid(input.getOid()); - result.setRid(input.getRid()); - result.setRegistrationUrl(input.getRegistrationUrl()); - result.setClientId(input.getClientId()); - result.setClientSecret(input.getClientSecret()); - result.setClientName(input.getClientName()); - result.setClientIcon(input.getClientIcon()); - result.setClientUrl(input.getClientUrl()); - result.setClientDescription(input.getClientDescription()); - result.setRedirectUrl(input.getRedirectUrl()); - result.setExpiresAt(input.getExpiresAt()); - result.setIssuedAt(input.getIssuedAt()); - result.setIncoming(input.isIncoming()); - result.setApiUrl(input.getApiUrl()); - result.setRegistrationEndpoint(input.getRegistrationEndpoint()); + + SServiceType result = new SServiceType(); + result.setOid(input.getOid()); + result.setRid(input.getRid()); + result.setName(input.getName()); + result.setSimpleName(input.getSimpleName()); + result.setSimpleType(SServiceSimpleType.values()[input.getSimpleType().ordinal()]); + List listfields = new ArrayList(); + for (ServiceField v : input.getFields()) { + listfields.add(convertToSObject(v)); + } + result.setFields(listfields); return result; } - public OAuthServer convertFromSObject(SOAuthServer input, DatabaseSession session) throws BimserverDatabaseException { + public ServiceType convertFromSObject(SServiceType input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - OAuthServer result = convertFromSObject(input, StoreFactory.eINSTANCE.createOAuthServer(), session); + ServiceType result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceType(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -8143,555 +8281,524 @@ public OAuthServer convertFromSObject(SOAuthServer input, DatabaseSession sessio return result; } - public OAuthServer convertFromSObject(SOAuthServer input) throws BimserverDatabaseException { - OAuthServer result = convertFromSObject(input, StoreFactory.eINSTANCE.createOAuthServer(), null); + public ServiceType convertFromSObject(SServiceType input) throws BimserverDatabaseException { + ServiceType result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceType(), null); return result; } - public OAuthServer convertFromSObject(SOAuthServer input, OAuthServer result, DatabaseSession session) throws BimserverDatabaseException { + public ServiceType convertFromSObject(SServiceType input, ServiceType result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setRegistrationUrl(input.getRegistrationUrl()); - result.setClientId(input.getClientId()); - result.setClientSecret(input.getClientSecret()); - result.setClientName(input.getClientName()); - result.setClientIcon(input.getClientIcon()); - result.setClientUrl(input.getClientUrl()); - result.setClientDescription(input.getClientDescription()); - result.setRedirectUrl(input.getRedirectUrl()); - result.setExpiresAt(input.getExpiresAt()); - result.setIssuedAt(input.getIssuedAt()); - result.setIncoming(input.isIncoming()); - result.setApiUrl(input.getApiUrl()); - result.setRegistrationEndpoint(input.getRegistrationEndpoint()); + result.setName(input.getName()); + result.setSimpleName(input.getSimpleName()); + result.setSimpleType(ServiceSimpleType.values()[input.getSimpleType().ordinal()]); + List listfields = result.getFields(); + for (SServiceField v : input.getFields()) { + listfields.add(convertFromSObject(v, session)); + } return result; } - public Set convertToSSetOAuthAuthorizationCode(Collection input) { - Set result = new HashSet(); - for (OAuthAuthorizationCode o : input) { + public Set convertToSSetServiceParameter(Collection input) { + Set result = new HashSet(); + for (ServiceParameter o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetOAuthAuthorizationCode(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SOAuthAuthorizationCode o : input) { + public Set convertFromSSetServiceParameter(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SServiceParameter o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListOAuthAuthorizationCode(Collection input) { - List result = new ArrayList(); - for (OAuthAuthorizationCode o : input) { + public List convertToSListServiceParameter(Collection input) { + List result = new ArrayList(); + for (ServiceParameter o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListOAuthAuthorizationCode(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SOAuthAuthorizationCode o : input) { + public List convertFromSListServiceParameter(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SServiceParameter o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SOAuthAuthorizationCode convertToSObject(OAuthAuthorizationCode input) { + public SServiceParameter convertToSObject(ServiceParameter input) { if (input == null) { return null; } - SOAuthAuthorizationCode result = new SOAuthAuthorizationCode(); - result.setOid(input.getOid()); - result.setRid(input.getRid()); - result.setCode(input.getCode()); - OAuthServer oauthServerVal = input.getOauthServer(); - result.setOauthServerId(oauthServerVal == null ? -1 : oauthServerVal.getOid()); - Authorization authorizationVal = input.getAuthorization(); - result.setAuthorizationId(authorizationVal == null ? -1 : authorizationVal.getOid()); - User userVal = input.getUser(); - result.setUserId(userVal == null ? -1 : userVal.getOid()); + SServiceParameter result = new SServiceParameter(); + result.setName(input.getName()); + result.setDoc(input.getDoc()); + ServiceType typeVal = input.getType(); + result.setType(convertToSObject(typeVal)); + ServiceType genericTypeVal = input.getGenericType(); + result.setGenericType(convertToSObject(genericTypeVal)); return result; } - public OAuthAuthorizationCode convertFromSObject(SOAuthAuthorizationCode input, DatabaseSession session) throws BimserverDatabaseException { + public ServiceParameter convertFromSObject(SServiceParameter input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - OAuthAuthorizationCode result = convertFromSObject(input, StoreFactory.eINSTANCE.createOAuthAuthorizationCode(), session); - - ((IdEObjectImpl)result).setOid(input.getOid()); - ((IdEObjectImpl)result).setRid(input.getRid()); + ServiceParameter result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceParameter(), session); return result; } - public OAuthAuthorizationCode convertFromSObject(SOAuthAuthorizationCode input) throws BimserverDatabaseException { - OAuthAuthorizationCode result = convertFromSObject(input, StoreFactory.eINSTANCE.createOAuthAuthorizationCode(), null); + public ServiceParameter convertFromSObject(SServiceParameter input) throws BimserverDatabaseException { + ServiceParameter result = convertFromSObject(input, StoreFactory.eINSTANCE.createServiceParameter(), null); return result; } - public OAuthAuthorizationCode convertFromSObject(SOAuthAuthorizationCode input, OAuthAuthorizationCode result, DatabaseSession session) throws BimserverDatabaseException { + public ServiceParameter convertFromSObject(SServiceParameter input, ServiceParameter result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setCode(input.getCode()); - result.setOauthServer((OAuthServer)session.get(StorePackage.eINSTANCE.getOAuthServer(), input.getOauthServerId(), OldQuery.getDefault())); - result.setAuthorization((Authorization)session.get(StorePackage.eINSTANCE.getAuthorization(), input.getAuthorizationId(), OldQuery.getDefault())); - result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); + result.setName(input.getName()); + result.setDoc(input.getDoc()); + result.setType(convertFromSObject(input.getType(), session)); + result.setGenericType(convertFromSObject(input.getGenericType(), session)); return result; } + public SPrimitiveEnum convertToSObject(PrimitiveEnum input) { + return SPrimitiveEnum.values()[input.ordinal()]; + } + + public PrimitiveEnum convertFromSObject(SPrimitiveEnum input) { + return PrimitiveEnum.values()[input.ordinal()]; + } - public Set convertToSSetAuthorization(Collection input) { - Set result = new HashSet(); - for (Authorization o : input) { + public Set convertToSSetTypeDefinition(Collection input) { + Set result = new HashSet(); + for (TypeDefinition o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetAuthorization(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SAuthorization o : input) { + public Set convertFromSSetTypeDefinition(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (STypeDefinition o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListAuthorization(Collection input) { - List result = new ArrayList(); - for (Authorization o : input) { + public List convertToSListTypeDefinition(Collection input) { + List result = new ArrayList(); + for (TypeDefinition o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListAuthorization(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SAuthorization o : input) { + public List convertFromSListTypeDefinition(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (STypeDefinition o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SAuthorization convertToSObject(Authorization input) { + public STypeDefinition convertToSObject(TypeDefinition input) { if (input == null) { return null; } - if (input instanceof SingleProjectAuthorization) { - return convertToSObject((SingleProjectAuthorization)input); + if (input instanceof ArrayDefinition) { + return convertToSObject((ArrayDefinition)input); } - else if (input instanceof RunServiceAuthorization) { - return convertToSObject((RunServiceAuthorization)input); + else if (input instanceof ObjectDefinition) { + return convertToSObject((ObjectDefinition)input); } - SAuthorization result = new SAuthorization(); - result.setOid(input.getOid()); - result.setRid(input.getRid()); + else if (input instanceof PrimitiveDefinition) { + return convertToSObject((PrimitiveDefinition)input); + } + STypeDefinition result = new STypeDefinition(); return result; } - public Authorization convertFromSObject(SAuthorization input, DatabaseSession session) throws BimserverDatabaseException { + public TypeDefinition convertFromSObject(STypeDefinition input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - Authorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createAuthorization(), session); - - ((IdEObjectImpl)result).setOid(input.getOid()); - ((IdEObjectImpl)result).setRid(input.getRid()); + TypeDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createTypeDefinition(), session); return result; } - public Authorization convertFromSObject(SAuthorization input) throws BimserverDatabaseException { - Authorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createAuthorization(), null); + public TypeDefinition convertFromSObject(STypeDefinition input) throws BimserverDatabaseException { + TypeDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createTypeDefinition(), null); return result; } - public Authorization convertFromSObject(SAuthorization input, Authorization result, DatabaseSession session) throws BimserverDatabaseException { + public TypeDefinition convertFromSObject(STypeDefinition input, TypeDefinition result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - if (input instanceof SSingleProjectAuthorization) { - return convertFromSObject((SSingleProjectAuthorization)input, session); + if (input instanceof SArrayDefinition) { + return convertFromSObject((SArrayDefinition)input, session); } - else if (input instanceof SRunServiceAuthorization) { - return convertFromSObject((SRunServiceAuthorization)input, session); + else if (input instanceof SObjectDefinition) { + return convertFromSObject((SObjectDefinition)input, session); + } + else if (input instanceof SPrimitiveDefinition) { + return convertFromSObject((SPrimitiveDefinition)input, session); } return result; } - public Set convertToSSetSingleProjectAuthorization(Collection input) { - Set result = new HashSet(); - for (SingleProjectAuthorization o : input) { + public Set convertToSSetObjectDefinition(Collection input) { + Set result = new HashSet(); + for (ObjectDefinition o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetSingleProjectAuthorization(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SSingleProjectAuthorization o : input) { + public Set convertFromSSetObjectDefinition(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SObjectDefinition o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListSingleProjectAuthorization(Collection input) { - List result = new ArrayList(); - for (SingleProjectAuthorization o : input) { + public List convertToSListObjectDefinition(Collection input) { + List result = new ArrayList(); + for (ObjectDefinition o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListSingleProjectAuthorization(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SSingleProjectAuthorization o : input) { + public List convertFromSListObjectDefinition(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SObjectDefinition o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SSingleProjectAuthorization convertToSObject(SingleProjectAuthorization input) { + public SObjectDefinition convertToSObject(ObjectDefinition input) { if (input == null) { return null; } - SSingleProjectAuthorization result = new SSingleProjectAuthorization(); - result.setOid(input.getOid()); - result.setRid(input.getRid()); - Project projectVal = input.getProject(); - result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); + SObjectDefinition result = new SObjectDefinition(); + List listparameters = new ArrayList(); + for (ParameterDefinition v : input.getParameters()) { + listparameters.add(convertToSObject(v)); + } + result.setParameters(listparameters); return result; } - public SingleProjectAuthorization convertFromSObject(SSingleProjectAuthorization input, DatabaseSession session) throws BimserverDatabaseException { + public ObjectDefinition convertFromSObject(SObjectDefinition input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - SingleProjectAuthorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createSingleProjectAuthorization(), session); - - ((IdEObjectImpl)result).setOid(input.getOid()); - ((IdEObjectImpl)result).setRid(input.getRid()); + ObjectDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectDefinition(), session); return result; } - public SingleProjectAuthorization convertFromSObject(SSingleProjectAuthorization input) throws BimserverDatabaseException { - SingleProjectAuthorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createSingleProjectAuthorization(), null); + public ObjectDefinition convertFromSObject(SObjectDefinition input) throws BimserverDatabaseException { + ObjectDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectDefinition(), null); return result; } - public SingleProjectAuthorization convertFromSObject(SSingleProjectAuthorization input, SingleProjectAuthorization result, DatabaseSession session) throws BimserverDatabaseException { + public ObjectDefinition convertFromSObject(SObjectDefinition input, ObjectDefinition result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); + List listparameters = result.getParameters(); + for (SParameterDefinition v : input.getParameters()) { + listparameters.add(convertFromSObject(v, session)); + } return result; } - public Set convertToSSetNewServiceDescriptor(Collection input) { - Set result = new HashSet(); - for (NewServiceDescriptor o : input) { + public Set convertToSSetPrimitiveDefinition(Collection input) { + Set result = new HashSet(); + for (PrimitiveDefinition o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetNewServiceDescriptor(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SNewServiceDescriptor o : input) { + public Set convertFromSSetPrimitiveDefinition(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SPrimitiveDefinition o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListNewServiceDescriptor(Collection input) { - List result = new ArrayList(); - for (NewServiceDescriptor o : input) { + public List convertToSListPrimitiveDefinition(Collection input) { + List result = new ArrayList(); + for (PrimitiveDefinition o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListNewServiceDescriptor(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SNewServiceDescriptor o : input) { + public List convertFromSListPrimitiveDefinition(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SPrimitiveDefinition o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SNewServiceDescriptor convertToSObject(NewServiceDescriptor input) { + public SPrimitiveDefinition convertToSObject(PrimitiveDefinition input) { if (input == null) { return null; } - SNewServiceDescriptor result = new SNewServiceDescriptor(); - result.setOid(input.getOid()); - result.setRid(input.getRid()); - result.setName(input.getName()); - result.setDescription(input.getDescription()); - result.setProvider(input.getProvider()); - result.setAuthorizationUrl(input.getAuthorizationUrl()); - result.setTokenUrl(input.getTokenUrl()); - result.setResourceUrl(input.getResourceUrl()); - result.setRegisterUrl(input.getRegisterUrl()); - result.getInputs().addAll(input.getInputs()); - result.getOutputs().addAll(input.getOutputs()); + SPrimitiveDefinition result = new SPrimitiveDefinition(); + result.setType(SPrimitiveEnum.values()[input.getType().ordinal()]); return result; } - public NewServiceDescriptor convertFromSObject(SNewServiceDescriptor input, DatabaseSession session) throws BimserverDatabaseException { + public PrimitiveDefinition convertFromSObject(SPrimitiveDefinition input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - NewServiceDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createNewServiceDescriptor(), session); - - ((IdEObjectImpl)result).setOid(input.getOid()); - ((IdEObjectImpl)result).setRid(input.getRid()); + PrimitiveDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createPrimitiveDefinition(), session); return result; } - public NewServiceDescriptor convertFromSObject(SNewServiceDescriptor input) throws BimserverDatabaseException { - NewServiceDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createNewServiceDescriptor(), null); + public PrimitiveDefinition convertFromSObject(SPrimitiveDefinition input) throws BimserverDatabaseException { + PrimitiveDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createPrimitiveDefinition(), null); return result; } - public NewServiceDescriptor convertFromSObject(SNewServiceDescriptor input, NewServiceDescriptor result, DatabaseSession session) throws BimserverDatabaseException { + public PrimitiveDefinition convertFromSObject(SPrimitiveDefinition input, PrimitiveDefinition result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setName(input.getName()); - result.setDescription(input.getDescription()); - result.setProvider(input.getProvider()); - result.setAuthorizationUrl(input.getAuthorizationUrl()); - result.setTokenUrl(input.getTokenUrl()); - result.setResourceUrl(input.getResourceUrl()); - result.setRegisterUrl(input.getRegisterUrl()); - result.getInputs().addAll(input.getInputs()); - result.getOutputs().addAll(input.getOutputs()); + result.setType(PrimitiveEnum.values()[input.getType().ordinal()]); return result; } - public Set convertToSSetFormatSerializerMap(Collection input) { - Set result = new HashSet(); - for (FormatSerializerMap o : input) { + public Set convertToSSetArrayDefinition(Collection input) { + Set result = new HashSet(); + for (ArrayDefinition o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetFormatSerializerMap(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SFormatSerializerMap o : input) { + public Set convertFromSSetArrayDefinition(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SArrayDefinition o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListFormatSerializerMap(Collection input) { - List result = new ArrayList(); - for (FormatSerializerMap o : input) { + public List convertToSListArrayDefinition(Collection input) { + List result = new ArrayList(); + for (ArrayDefinition o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListFormatSerializerMap(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SFormatSerializerMap o : input) { + public List convertFromSListArrayDefinition(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SArrayDefinition o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SFormatSerializerMap convertToSObject(FormatSerializerMap input) { + public SArrayDefinition convertToSObject(ArrayDefinition input) { if (input == null) { return null; } - SFormatSerializerMap result = new SFormatSerializerMap(); - result.setOid(input.getOid()); - result.setRid(input.getRid()); - result.setFormat(input.getFormat()); - List listserializers = new ArrayList(); - for (SerializerPluginConfiguration v : input.getSerializers()) { - listserializers.add(convertToSObject(v)); - } - result.setSerializers(listserializers); + SArrayDefinition result = new SArrayDefinition(); + TypeDefinition typeVal = input.getType(); + result.setType(convertToSObject(typeVal)); return result; } - public FormatSerializerMap convertFromSObject(SFormatSerializerMap input, DatabaseSession session) throws BimserverDatabaseException { + public ArrayDefinition convertFromSObject(SArrayDefinition input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - FormatSerializerMap result = convertFromSObject(input, StoreFactory.eINSTANCE.createFormatSerializerMap(), session); - - ((IdEObjectImpl)result).setOid(input.getOid()); - ((IdEObjectImpl)result).setRid(input.getRid()); + ArrayDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createArrayDefinition(), session); return result; } - public FormatSerializerMap convertFromSObject(SFormatSerializerMap input) throws BimserverDatabaseException { - FormatSerializerMap result = convertFromSObject(input, StoreFactory.eINSTANCE.createFormatSerializerMap(), null); + public ArrayDefinition convertFromSObject(SArrayDefinition input) throws BimserverDatabaseException { + ArrayDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createArrayDefinition(), null); return result; } - public FormatSerializerMap convertFromSObject(SFormatSerializerMap input, FormatSerializerMap result, DatabaseSession session) throws BimserverDatabaseException { + public ArrayDefinition convertFromSObject(SArrayDefinition input, ArrayDefinition result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setFormat(input.getFormat()); - List listserializers = result.getSerializers(); - for (SSerializerPluginConfiguration v : input.getSerializers()) { - listserializers.add(convertFromSObject(v, session)); - } + result.setType(convertFromSObject(input.getType(), session)); return result; } - public Set convertToSSetAction(Collection input) { - Set result = new HashSet(); - for (Action o : input) { + public Set convertToSSetParameterDefinition(Collection input) { + Set result = new HashSet(); + for (ParameterDefinition o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetAction(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SAction o : input) { + public Set convertFromSSetParameterDefinition(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SParameterDefinition o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListAction(Collection input) { - List result = new ArrayList(); - for (Action o : input) { + public List convertToSListParameterDefinition(Collection input) { + List result = new ArrayList(); + for (ParameterDefinition o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListAction(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SAction o : input) { + public List convertFromSListParameterDefinition(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SParameterDefinition o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SAction convertToSObject(Action input) { + public SParameterDefinition convertToSObject(ParameterDefinition input) { if (input == null) { return null; } - if (input instanceof CheckinRevision) { - return convertToSObject((CheckinRevision)input); - } - else if (input instanceof StoreExtendedData) { - return convertToSObject((StoreExtendedData)input); - } - SAction result = new SAction(); - result.setOid(input.getOid()); - result.setRid(input.getRid()); + SParameterDefinition result = new SParameterDefinition(); + result.setName(input.getName()); + result.setIdentifier(input.getIdentifier()); + result.setRequired(input.isRequired()); + result.setDescription(input.getDescription()); + TypeDefinition typeVal = input.getType(); + result.setType(convertToSObject(typeVal)); + Type defaultValueVal = input.getDefaultValue(); + result.setDefaultValue(convertToSObject(defaultValueVal)); return result; } - public Action convertFromSObject(SAction input, DatabaseSession session) throws BimserverDatabaseException { + public ParameterDefinition convertFromSObject(SParameterDefinition input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - Action result = convertFromSObject(input, StoreFactory.eINSTANCE.createAction(), session); - - ((IdEObjectImpl)result).setOid(input.getOid()); - ((IdEObjectImpl)result).setRid(input.getRid()); + ParameterDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createParameterDefinition(), session); return result; } - public Action convertFromSObject(SAction input) throws BimserverDatabaseException { - Action result = convertFromSObject(input, StoreFactory.eINSTANCE.createAction(), null); + public ParameterDefinition convertFromSObject(SParameterDefinition input) throws BimserverDatabaseException { + ParameterDefinition result = convertFromSObject(input, StoreFactory.eINSTANCE.createParameterDefinition(), null); return result; } - public Action convertFromSObject(SAction input, Action result, DatabaseSession session) throws BimserverDatabaseException { + public ParameterDefinition convertFromSObject(SParameterDefinition input, ParameterDefinition result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - if (input instanceof SCheckinRevision) { - return convertFromSObject((SCheckinRevision)input, session); - } - else if (input instanceof SStoreExtendedData) { - return convertFromSObject((SStoreExtendedData)input, session); - } + result.setName(input.getName()); + result.setIdentifier(input.getIdentifier()); + result.setRequired(input.isRequired()); + result.setDescription(input.getDescription()); + result.setType(convertFromSObject(input.getType(), session)); + result.setDefaultValue(convertFromSObject(input.getDefaultValue(), session)); return result; } - public Set convertToSSetStoreExtendedData(Collection input) { - Set result = new HashSet(); - for (StoreExtendedData o : input) { + public Set convertToSSetType(Collection input) { + Set result = new HashSet(); + for (Type o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetStoreExtendedData(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SStoreExtendedData o : input) { + public Set convertFromSSetType(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SType o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListStoreExtendedData(Collection input) { - List result = new ArrayList(); - for (StoreExtendedData o : input) { + public List convertToSListType(Collection input) { + List result = new ArrayList(); + for (Type o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListStoreExtendedData(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SStoreExtendedData o : input) { + public List convertFromSListType(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SType o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SStoreExtendedData convertToSObject(StoreExtendedData input) { + public SType convertToSObject(Type input) { if (input == null) { return null; } - SStoreExtendedData result = new SStoreExtendedData(); + if (input instanceof ArrayType) { + return convertToSObject((ArrayType)input); + } + else if (input instanceof ObjectType) { + return convertToSObject((ObjectType)input); + } + else if (input instanceof PrimitiveType) { + return convertToSObject((PrimitiveType)input); + } + SType result = new SType(); result.setOid(input.getOid()); result.setRid(input.getRid()); return result; } - public StoreExtendedData convertFromSObject(SStoreExtendedData input, DatabaseSession session) throws BimserverDatabaseException { + public Type convertFromSObject(SType input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - StoreExtendedData result = convertFromSObject(input, StoreFactory.eINSTANCE.createStoreExtendedData(), session); + Type result = convertFromSObject(input, StoreFactory.eINSTANCE.createType(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -8699,69 +8806,82 @@ public StoreExtendedData convertFromSObject(SStoreExtendedData input, DatabaseSe return result; } - public StoreExtendedData convertFromSObject(SStoreExtendedData input) throws BimserverDatabaseException { - StoreExtendedData result = convertFromSObject(input, StoreFactory.eINSTANCE.createStoreExtendedData(), null); + public Type convertFromSObject(SType input) throws BimserverDatabaseException { + Type result = convertFromSObject(input, StoreFactory.eINSTANCE.createType(), null); return result; } - public StoreExtendedData convertFromSObject(SStoreExtendedData input, StoreExtendedData result, DatabaseSession session) throws BimserverDatabaseException { + public Type convertFromSObject(SType input, Type result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } + if (input instanceof SArrayType) { + return convertFromSObject((SArrayType)input, session); + } + else if (input instanceof SObjectType) { + return convertFromSObject((SObjectType)input, session); + } + else if (input instanceof SPrimitiveType) { + return convertFromSObject((SPrimitiveType)input, session); + } return result; } - public Set convertToSSetCheckinRevision(Collection input) { - Set result = new HashSet(); - for (CheckinRevision o : input) { + public Set convertToSSetObjectType(Collection input) { + Set result = new HashSet(); + for (ObjectType o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetCheckinRevision(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SCheckinRevision o : input) { + public Set convertFromSSetObjectType(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SObjectType o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListCheckinRevision(Collection input) { - List result = new ArrayList(); - for (CheckinRevision o : input) { + public List convertToSListObjectType(Collection input) { + List result = new ArrayList(); + for (ObjectType o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListCheckinRevision(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SCheckinRevision o : input) { + public List convertFromSListObjectType(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SObjectType o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SCheckinRevision convertToSObject(CheckinRevision input) { + public SObjectType convertToSObject(ObjectType input) { if (input == null) { return null; } - SCheckinRevision result = new SCheckinRevision(); + SObjectType result = new SObjectType(); result.setOid(input.getOid()); result.setRid(input.getRid()); - Project projectVal = input.getProject(); - result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); + result.setName(input.getName()); + List listparameters = new ArrayList(); + for (Parameter v : input.getParameters()) { + listparameters.add(convertToSObject(v)); + } + result.setParameters(listparameters); return result; } - public CheckinRevision convertFromSObject(SCheckinRevision input, DatabaseSession session) throws BimserverDatabaseException { + public ObjectType convertFromSObject(SObjectType input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - CheckinRevision result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckinRevision(), session); + ObjectType result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectType(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -8769,94 +8889,87 @@ public CheckinRevision convertFromSObject(SCheckinRevision input, DatabaseSessio return result; } - public CheckinRevision convertFromSObject(SCheckinRevision input) throws BimserverDatabaseException { - CheckinRevision result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckinRevision(), null); + public ObjectType convertFromSObject(SObjectType input) throws BimserverDatabaseException { + ObjectType result = convertFromSObject(input, StoreFactory.eINSTANCE.createObjectType(), null); return result; } - public CheckinRevision convertFromSObject(SCheckinRevision input, CheckinRevision result, DatabaseSession session) throws BimserverDatabaseException { + public ObjectType convertFromSObject(SObjectType input, ObjectType result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); + result.setName(input.getName()); + List listparameters = result.getParameters(); + for (SParameter v : input.getParameters()) { + listparameters.add(convertFromSObject(v, session)); + } return result; } - public SServiceStatus convertToSObject(ServiceStatus input) { - return SServiceStatus.values()[input.ordinal()]; - } - - public ServiceStatus convertFromSObject(SServiceStatus input) { - return ServiceStatus.values()[input.ordinal()]; - } - public Set convertToSSetNewService(Collection input) { - Set result = new HashSet(); - for (NewService o : input) { + public Set convertToSSetPrimitiveType(Collection input) { + Set result = new HashSet(); + for (PrimitiveType o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetNewService(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SNewService o : input) { + public Set convertFromSSetPrimitiveType(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SPrimitiveType o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListNewService(Collection input) { - List result = new ArrayList(); - for (NewService o : input) { + public List convertToSListPrimitiveType(Collection input) { + List result = new ArrayList(); + for (PrimitiveType o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListNewService(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SNewService o : input) { + public List convertFromSListPrimitiveType(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SPrimitiveType o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SNewService convertToSObject(NewService input) { + public SPrimitiveType convertToSObject(PrimitiveType input) { if (input == null) { return null; } - SNewService result = new SNewService(); + if (input instanceof LongType) { + return convertToSObject((LongType)input); + } + else if (input instanceof DoubleType) { + return convertToSObject((DoubleType)input); + } + else if (input instanceof BooleanType) { + return convertToSObject((BooleanType)input); + } + else if (input instanceof ByteArrayType) { + return convertToSObject((ByteArrayType)input); + } + else if (input instanceof StringType) { + return convertToSObject((StringType)input); + } + SPrimitiveType result = new SPrimitiveType(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setName(input.getName()); - result.setProvider(input.getProvider()); - result.setDescription(input.getDescription()); - result.setAuthorizationUrl(input.getAuthorizationUrl()); - result.setTokenUrl(input.getTokenUrl()); - result.setResourceUrl(input.getResourceUrl()); - result.setRegisterUrl(input.getRegisterUrl()); - result.setInput(input.getInput()); - result.setOauthCode(input.getOauthCode()); - result.setStatus(SServiceStatus.values()[input.getStatus().ordinal()]); - result.setOutput(input.getOutput()); - result.setAccessToken(input.getAccessToken()); - result.setStateJson(input.getStateJson()); - SerializerPluginConfiguration serializerVal = input.getSerializer(); - result.setSerializerId(serializerVal == null ? -1 : serializerVal.getOid()); - Action actionVal = input.getAction(); - result.setAction(convertToSObject(actionVal)); - Project projectVal = input.getProject(); - result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); return result; } - public NewService convertFromSObject(SNewService input, DatabaseSession session) throws BimserverDatabaseException { + public PrimitiveType convertFromSObject(SPrimitiveType input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - NewService result = convertFromSObject(input, StoreFactory.eINSTANCE.createNewService(), session); + PrimitiveType result = convertFromSObject(input, StoreFactory.eINSTANCE.createPrimitiveType(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -8864,85 +8977,83 @@ public NewService convertFromSObject(SNewService input, DatabaseSession session) return result; } - public NewService convertFromSObject(SNewService input) throws BimserverDatabaseException { - NewService result = convertFromSObject(input, StoreFactory.eINSTANCE.createNewService(), null); + public PrimitiveType convertFromSObject(SPrimitiveType input) throws BimserverDatabaseException { + PrimitiveType result = convertFromSObject(input, StoreFactory.eINSTANCE.createPrimitiveType(), null); return result; } - public NewService convertFromSObject(SNewService input, NewService result, DatabaseSession session) throws BimserverDatabaseException { + public PrimitiveType convertFromSObject(SPrimitiveType input, PrimitiveType result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setName(input.getName()); - result.setProvider(input.getProvider()); - result.setDescription(input.getDescription()); - result.setAuthorizationUrl(input.getAuthorizationUrl()); - result.setTokenUrl(input.getTokenUrl()); - result.setResourceUrl(input.getResourceUrl()); - result.setRegisterUrl(input.getRegisterUrl()); - result.setInput(input.getInput()); - result.setOauthCode(input.getOauthCode()); - result.setStatus(ServiceStatus.values()[input.getStatus().ordinal()]); - result.setOutput(input.getOutput()); - result.setAccessToken(input.getAccessToken()); - result.setStateJson(input.getStateJson()); - result.setSerializer((SerializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getSerializerPluginConfiguration(), input.getSerializerId(), OldQuery.getDefault())); - result.setAction(convertFromSObject(input.getAction(), session)); - result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); + if (input instanceof SLongType) { + return convertFromSObject((SLongType)input, session); + } + else if (input instanceof SDoubleType) { + return convertFromSObject((SDoubleType)input, session); + } + else if (input instanceof SBooleanType) { + return convertFromSObject((SBooleanType)input, session); + } + else if (input instanceof SByteArrayType) { + return convertFromSObject((SByteArrayType)input, session); + } + else if (input instanceof SStringType) { + return convertFromSObject((SStringType)input, session); + } return result; } - public Set convertToSSetRunServiceAuthorization(Collection input) { - Set result = new HashSet(); - for (RunServiceAuthorization o : input) { + public Set convertToSSetLongType(Collection input) { + Set result = new HashSet(); + for (LongType o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetRunServiceAuthorization(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SRunServiceAuthorization o : input) { + public Set convertFromSSetLongType(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SLongType o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListRunServiceAuthorization(Collection input) { - List result = new ArrayList(); - for (RunServiceAuthorization o : input) { + public List convertToSListLongType(Collection input) { + List result = new ArrayList(); + for (LongType o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListRunServiceAuthorization(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SRunServiceAuthorization o : input) { + public List convertFromSListLongType(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SLongType o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SRunServiceAuthorization convertToSObject(RunServiceAuthorization input) { + public SLongType convertToSObject(LongType input) { if (input == null) { return null; } - SRunServiceAuthorization result = new SRunServiceAuthorization(); + SLongType result = new SLongType(); result.setOid(input.getOid()); result.setRid(input.getRid()); - InternalServicePluginConfiguration serviceVal = input.getService(); - result.setServiceId(serviceVal == null ? -1 : serviceVal.getOid()); + result.setValue(input.getValue()); return result; } - public RunServiceAuthorization convertFromSObject(SRunServiceAuthorization input, DatabaseSession session) throws BimserverDatabaseException { + public LongType convertFromSObject(SLongType input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - RunServiceAuthorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createRunServiceAuthorization(), session); + LongType result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongType(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -8950,73 +9061,69 @@ public RunServiceAuthorization convertFromSObject(SRunServiceAuthorization input return result; } - public RunServiceAuthorization convertFromSObject(SRunServiceAuthorization input) throws BimserverDatabaseException { - RunServiceAuthorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createRunServiceAuthorization(), null); + public LongType convertFromSObject(SLongType input) throws BimserverDatabaseException { + LongType result = convertFromSObject(input, StoreFactory.eINSTANCE.createLongType(), null); return result; } - public RunServiceAuthorization convertFromSObject(SRunServiceAuthorization input, RunServiceAuthorization result, DatabaseSession session) throws BimserverDatabaseException { + public LongType convertFromSObject(SLongType input, LongType result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setService((InternalServicePluginConfiguration)session.get(StorePackage.eINSTANCE.getInternalServicePluginConfiguration(), input.getServiceId(), OldQuery.getDefault())); + result.setValue(input.getValue()); return result; } - public Set convertToSSetDensityCollection(Collection input) { - Set result = new HashSet(); - for (DensityCollection o : input) { + public Set convertToSSetByteArrayType(Collection input) { + Set result = new HashSet(); + for (ByteArrayType o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetDensityCollection(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SDensityCollection o : input) { + public Set convertFromSSetByteArrayType(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SByteArrayType o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListDensityCollection(Collection input) { - List result = new ArrayList(); - for (DensityCollection o : input) { + public List convertToSListByteArrayType(Collection input) { + List result = new ArrayList(); + for (ByteArrayType o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListDensityCollection(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SDensityCollection o : input) { + public List convertFromSListByteArrayType(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SByteArrayType o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SDensityCollection convertToSObject(DensityCollection input) { + public SByteArrayType convertToSObject(ByteArrayType input) { if (input == null) { return null; } - SDensityCollection result = new SDensityCollection(); + SByteArrayType result = new SByteArrayType(); result.setOid(input.getOid()); result.setRid(input.getRid()); - List listdensities = new ArrayList(); - for (Density v : input.getDensities()) { - listdensities.add(convertToSObject(v)); - } - result.setDensities(listdensities); + result.setValue(input.getValue()); return result; } - public DensityCollection convertFromSObject(SDensityCollection input, DatabaseSession session) throws BimserverDatabaseException { + public ByteArrayType convertFromSObject(SByteArrayType input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - DensityCollection result = convertFromSObject(input, StoreFactory.eINSTANCE.createDensityCollection(), session); + ByteArrayType result = convertFromSObject(input, StoreFactory.eINSTANCE.createByteArrayType(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -9024,77 +9131,69 @@ public DensityCollection convertFromSObject(SDensityCollection input, DatabaseSe return result; } - public DensityCollection convertFromSObject(SDensityCollection input) throws BimserverDatabaseException { - DensityCollection result = convertFromSObject(input, StoreFactory.eINSTANCE.createDensityCollection(), null); + public ByteArrayType convertFromSObject(SByteArrayType input) throws BimserverDatabaseException { + ByteArrayType result = convertFromSObject(input, StoreFactory.eINSTANCE.createByteArrayType(), null); return result; } - public DensityCollection convertFromSObject(SDensityCollection input, DensityCollection result, DatabaseSession session) throws BimserverDatabaseException { + public ByteArrayType convertFromSObject(SByteArrayType input, ByteArrayType result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - List listdensities = result.getDensities(); - for (SDensity v : input.getDensities()) { - listdensities.add(convertFromSObject(v, session)); - } + result.setValue(input.getValue()); return result; } - public Set convertToSSetDensity(Collection input) { - Set result = new HashSet(); - for (Density o : input) { + public Set convertToSSetDoubleType(Collection input) { + Set result = new HashSet(); + for (DoubleType o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetDensity(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SDensity o : input) { + public Set convertFromSSetDoubleType(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SDoubleType o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListDensity(Collection input) { - List result = new ArrayList(); - for (Density o : input) { + public List convertToSListDoubleType(Collection input) { + List result = new ArrayList(); + for (DoubleType o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListDensity(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SDensity o : input) { + public List convertFromSListDoubleType(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SDoubleType o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SDensity convertToSObject(Density input) { + public SDoubleType convertToSObject(DoubleType input) { if (input == null) { return null; } - SDensity result = new SDensity(); + SDoubleType result = new SDoubleType(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setType(input.getType()); - result.setGeometryInfoId(input.getGeometryInfoId()); - result.setTrianglesBelow(input.getTrianglesBelow()); - result.setTrianglesAbove(input.getTrianglesAbove()); - result.setVolume(input.getVolume()); - result.setDensity(input.getDensity()); + result.setValue(input.getValue()); return result; } - public Density convertFromSObject(SDensity input, DatabaseSession session) throws BimserverDatabaseException { + public DoubleType convertFromSObject(SDoubleType input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - Density result = convertFromSObject(input, StoreFactory.eINSTANCE.createDensity(), session); + DoubleType result = convertFromSObject(input, StoreFactory.eINSTANCE.createDoubleType(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -9102,126 +9201,69 @@ public Density convertFromSObject(SDensity input, DatabaseSession session) throw return result; } - public Density convertFromSObject(SDensity input) throws BimserverDatabaseException { - Density result = convertFromSObject(input, StoreFactory.eINSTANCE.createDensity(), null); + public DoubleType convertFromSObject(SDoubleType input) throws BimserverDatabaseException { + DoubleType result = convertFromSObject(input, StoreFactory.eINSTANCE.createDoubleType(), null); return result; } - public Density convertFromSObject(SDensity input, Density result, DatabaseSession session) throws BimserverDatabaseException { + public DoubleType convertFromSObject(SDoubleType input, DoubleType result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setType(input.getType()); - result.setGeometryInfoId(input.getGeometryInfoId()); - result.setTrianglesBelow(input.getTrianglesBelow()); - result.setTrianglesAbove(input.getTrianglesAbove()); - result.setVolume(input.getVolume()); - result.setDensity(input.getDensity()); + result.setValue(input.getValue()); return result; } - public SAccessMethod convertToSObject(AccessMethod input) { - return SAccessMethod.values()[input.ordinal()]; - } - - public AccessMethod convertFromSObject(SAccessMethod input) { - return AccessMethod.values()[input.ordinal()]; - } - public Set convertToSSetLogAction(Collection input) { - Set result = new HashSet(); - for (LogAction o : input) { + public Set convertToSSetStringType(Collection input) { + Set result = new HashSet(); + for (StringType o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetLogAction(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SLogAction o : input) { + public Set convertFromSSetStringType(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SStringType o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListLogAction(Collection input) { - List result = new ArrayList(); - for (LogAction o : input) { + public List convertToSListStringType(Collection input) { + List result = new ArrayList(); + for (StringType o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListLogAction(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SLogAction o : input) { + public List convertFromSListStringType(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SStringType o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SLogAction convertToSObject(LogAction input) { + public SStringType convertToSObject(StringType input) { if (input == null) { return null; } - if (input instanceof ExtendedDataAddedToRevision) { - return convertToSObject((ExtendedDataAddedToRevision)input); - } - else if (input instanceof NewObjectIDMUploaded) { - return convertToSObject((NewObjectIDMUploaded)input); - } - else if (input instanceof GeoTagUpdated) { - return convertToSObject((GeoTagUpdated)input); - } - else if (input instanceof ProjectRelated) { - return convertToSObject((ProjectRelated)input); - } - else if (input instanceof SettingsSaved) { - return convertToSObject((SettingsSaved)input); - } - else if (input instanceof DatabaseCreated) { - return convertToSObject((DatabaseCreated)input); - } - else if (input instanceof CheckoutRelated) { - return convertToSObject((CheckoutRelated)input); - } - else if (input instanceof UserRelated) { - return convertToSObject((UserRelated)input); - } - else if (input instanceof RevisionRelated) { - return convertToSObject((RevisionRelated)input); - } - else if (input instanceof Download) { - return convertToSObject((Download)input); - } - else if (input instanceof ExtendedDataAddedToProject) { - return convertToSObject((ExtendedDataAddedToProject)input); - } - else if (input instanceof RemoteServiceCalled) { - return convertToSObject((RemoteServiceCalled)input); - } - else if (input instanceof ServerStarted) { - return convertToSObject((ServerStarted)input); - } - else if (input instanceof RevisionBranched) { - return convertToSObject((RevisionBranched)input); - } - SLogAction result = new SLogAction(); + SStringType result = new SStringType(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + result.setValue(input.getValue()); return result; } - public LogAction convertFromSObject(SLogAction input, DatabaseSession session) throws BimserverDatabaseException { + public StringType convertFromSObject(SStringType input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - LogAction result = convertFromSObject(input, LogFactory.eINSTANCE.createLogAction(), session); + StringType result = convertFromSObject(input, StoreFactory.eINSTANCE.createStringType(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -9229,117 +9271,69 @@ public LogAction convertFromSObject(SLogAction input, DatabaseSession session) t return result; } - public LogAction convertFromSObject(SLogAction input) throws BimserverDatabaseException { - LogAction result = convertFromSObject(input, LogFactory.eINSTANCE.createLogAction(), null); + public StringType convertFromSObject(SStringType input) throws BimserverDatabaseException { + StringType result = convertFromSObject(input, StoreFactory.eINSTANCE.createStringType(), null); return result; } - public LogAction convertFromSObject(SLogAction input, LogAction result, DatabaseSession session) throws BimserverDatabaseException { + public StringType convertFromSObject(SStringType input, StringType result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - if (input instanceof SExtendedDataAddedToRevision) { - return convertFromSObject((SExtendedDataAddedToRevision)input, session); - } - else if (input instanceof SNewObjectIDMUploaded) { - return convertFromSObject((SNewObjectIDMUploaded)input, session); - } - else if (input instanceof SGeoTagUpdated) { - return convertFromSObject((SGeoTagUpdated)input, session); - } - else if (input instanceof SProjectRelated) { - return convertFromSObject((SProjectRelated)input, session); - } - else if (input instanceof SSettingsSaved) { - return convertFromSObject((SSettingsSaved)input, session); - } - else if (input instanceof SDatabaseCreated) { - return convertFromSObject((SDatabaseCreated)input, session); - } - else if (input instanceof SCheckoutRelated) { - return convertFromSObject((SCheckoutRelated)input, session); - } - else if (input instanceof SUserRelated) { - return convertFromSObject((SUserRelated)input, session); - } - else if (input instanceof SRevisionRelated) { - return convertFromSObject((SRevisionRelated)input, session); - } - else if (input instanceof SDownload) { - return convertFromSObject((SDownload)input, session); - } - else if (input instanceof SExtendedDataAddedToProject) { - return convertFromSObject((SExtendedDataAddedToProject)input, session); - } - else if (input instanceof SRemoteServiceCalled) { - return convertFromSObject((SRemoteServiceCalled)input, session); - } - else if (input instanceof SServerStarted) { - return convertFromSObject((SServerStarted)input, session); - } - else if (input instanceof SRevisionBranched) { - return convertFromSObject((SRevisionBranched)input, session); - } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setValue(input.getValue()); return result; } - public Set convertToSSetServerLog(Collection input) { - Set result = new HashSet(); - for (ServerLog o : input) { + public Set convertToSSetBooleanType(Collection input) { + Set result = new HashSet(); + for (BooleanType o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetServerLog(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SServerLog o : input) { + public Set convertFromSSetBooleanType(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SBooleanType o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListServerLog(Collection input) { - List result = new ArrayList(); - for (ServerLog o : input) { + public List convertToSListBooleanType(Collection input) { + List result = new ArrayList(); + for (BooleanType o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListServerLog(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SServerLog o : input) { + public List convertFromSListBooleanType(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SBooleanType o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SServerLog convertToSObject(ServerLog input) { + public SBooleanType convertToSObject(BooleanType input) { if (input == null) { return null; } - SServerLog result = new SServerLog(); + SBooleanType result = new SBooleanType(); result.setOid(input.getOid()); result.setRid(input.getRid()); - List listactions = new ArrayList(); - for (LogAction v : input.getActions()) { - listactions.add(v.getOid()); - } - result.setActions(listactions); + result.setValue(input.isValue()); return result; } - public ServerLog convertFromSObject(SServerLog input, DatabaseSession session) throws BimserverDatabaseException { + public BooleanType convertFromSObject(SBooleanType input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ServerLog result = convertFromSObject(input, LogFactory.eINSTANCE.createServerLog(), session); + BooleanType result = convertFromSObject(input, StoreFactory.eINSTANCE.createBooleanType(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -9347,89 +9341,73 @@ public ServerLog convertFromSObject(SServerLog input, DatabaseSession session) t return result; } - public ServerLog convertFromSObject(SServerLog input) throws BimserverDatabaseException { - ServerLog result = convertFromSObject(input, LogFactory.eINSTANCE.createServerLog(), null); + public BooleanType convertFromSObject(SBooleanType input) throws BimserverDatabaseException { + BooleanType result = convertFromSObject(input, StoreFactory.eINSTANCE.createBooleanType(), null); return result; } - public ServerLog convertFromSObject(SServerLog input, ServerLog result, DatabaseSession session) throws BimserverDatabaseException { + public BooleanType convertFromSObject(SBooleanType input, BooleanType result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - List listactions = result.getActions(); - for (long oid : input.getActions()) { - listactions.add((LogAction)session.get(LogPackage.eINSTANCE.getLogAction(), oid, OldQuery.getDefault())); - } + result.setValue(input.isValue()); return result; } - public Set convertToSSetProjectRelated(Collection input) { - Set result = new HashSet(); - for (ProjectRelated o : input) { + public Set convertToSSetArrayType(Collection input) { + Set result = new HashSet(); + for (ArrayType o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetProjectRelated(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SProjectRelated o : input) { + public Set convertFromSSetArrayType(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SArrayType o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListProjectRelated(Collection input) { - List result = new ArrayList(); - for (ProjectRelated o : input) { + public List convertToSListArrayType(Collection input) { + List result = new ArrayList(); + for (ArrayType o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListProjectRelated(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SProjectRelated o : input) { + public List convertFromSListArrayType(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SArrayType o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SProjectRelated convertToSObject(ProjectRelated input) { + public SArrayType convertToSObject(ArrayType input) { if (input == null) { return null; } - if (input instanceof NewProjectAdded) { - return convertToSObject((NewProjectAdded)input); - } - else if (input instanceof ProjectUndeleted) { - return convertToSObject((ProjectUndeleted)input); - } - else if (input instanceof ProjectDeleted) { - return convertToSObject((ProjectDeleted)input); - } - else if (input instanceof ProjectUpdated) { - return convertToSObject((ProjectUpdated)input); - } - SProjectRelated result = new SProjectRelated(); + SArrayType result = new SArrayType(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - Project projectVal = input.getProject(); - result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); + List listvalues = new ArrayList(); + for (Type v : input.getValues()) { + listvalues.add(convertToSObject(v)); + } + result.setValues(listvalues); return result; } - public ProjectRelated convertFromSObject(SProjectRelated input, DatabaseSession session) throws BimserverDatabaseException { + public ArrayType convertFromSObject(SArrayType input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ProjectRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectRelated(), session); + ArrayType result = convertFromSObject(input, StoreFactory.eINSTANCE.createArrayType(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -9437,92 +9415,75 @@ public ProjectRelated convertFromSObject(SProjectRelated input, DatabaseSession return result; } - public ProjectRelated convertFromSObject(SProjectRelated input) throws BimserverDatabaseException { - ProjectRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectRelated(), null); + public ArrayType convertFromSObject(SArrayType input) throws BimserverDatabaseException { + ArrayType result = convertFromSObject(input, StoreFactory.eINSTANCE.createArrayType(), null); return result; } - public ProjectRelated convertFromSObject(SProjectRelated input, ProjectRelated result, DatabaseSession session) throws BimserverDatabaseException { + public ArrayType convertFromSObject(SArrayType input, ArrayType result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - if (input instanceof SNewProjectAdded) { - return convertFromSObject((SNewProjectAdded)input, session); - } - else if (input instanceof SProjectUndeleted) { - return convertFromSObject((SProjectUndeleted)input, session); - } - else if (input instanceof SProjectDeleted) { - return convertFromSObject((SProjectDeleted)input, session); - } - else if (input instanceof SProjectUpdated) { - return convertFromSObject((SProjectUpdated)input, session); + List listvalues = result.getValues(); + for (SType v : input.getValues()) { + listvalues.add(convertFromSObject(v, session)); } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); return result; } - public Set convertToSSetCheckoutRelated(Collection input) { - Set result = new HashSet(); - for (CheckoutRelated o : input) { + public Set convertToSSetParameter(Collection input) { + Set result = new HashSet(); + for (Parameter o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetCheckoutRelated(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SCheckoutRelated o : input) { + public Set convertFromSSetParameter(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SParameter o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListCheckoutRelated(Collection input) { - List result = new ArrayList(); - for (CheckoutRelated o : input) { + public List convertToSListParameter(Collection input) { + List result = new ArrayList(); + for (Parameter o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListCheckoutRelated(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SCheckoutRelated o : input) { + public List convertFromSListParameter(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SParameter o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SCheckoutRelated convertToSObject(CheckoutRelated input) { + public SParameter convertToSObject(Parameter input) { if (input == null) { return null; } - if (input instanceof NewCheckoutAdded) { - return convertToSObject((NewCheckoutAdded)input); - } - SCheckoutRelated result = new SCheckoutRelated(); + SParameter result = new SParameter(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - Checkout checkoutVal = input.getCheckout(); - result.setCheckoutId(checkoutVal == null ? -1 : checkoutVal.getOid()); + result.setIdentifier(input.getIdentifier()); + result.setName(input.getName()); + Type valueVal = input.getValue(); + result.setValue(convertToSObject(valueVal)); return result; } - public CheckoutRelated convertFromSObject(SCheckoutRelated input, DatabaseSession session) throws BimserverDatabaseException { + public Parameter convertFromSObject(SParameter input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - CheckoutRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createCheckoutRelated(), session); + Parameter result = convertFromSObject(input, StoreFactory.eINSTANCE.createParameter(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -9530,86 +9491,79 @@ public CheckoutRelated convertFromSObject(SCheckoutRelated input, DatabaseSessio return result; } - public CheckoutRelated convertFromSObject(SCheckoutRelated input) throws BimserverDatabaseException { - CheckoutRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createCheckoutRelated(), null); + public Parameter convertFromSObject(SParameter input) throws BimserverDatabaseException { + Parameter result = convertFromSObject(input, StoreFactory.eINSTANCE.createParameter(), null); return result; } - public CheckoutRelated convertFromSObject(SCheckoutRelated input, CheckoutRelated result, DatabaseSession session) throws BimserverDatabaseException { + public Parameter convertFromSObject(SParameter input, Parameter result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - if (input instanceof SNewCheckoutAdded) { - return convertFromSObject((SNewCheckoutAdded)input, session); - } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setCheckout((Checkout)session.get(StorePackage.eINSTANCE.getCheckout(), input.getCheckoutId(), OldQuery.getDefault())); + result.setIdentifier(input.getIdentifier()); + result.setName(input.getName()); + result.setValue(convertFromSObject(input.getValue(), session)); return result; } + public SNotifictionResultEnum convertToSObject(NotifictionResultEnum input) { + return SNotifictionResultEnum.values()[input.ordinal()]; + } + + public NotifictionResultEnum convertFromSObject(SNotifictionResultEnum input) { + return NotifictionResultEnum.values()[input.ordinal()]; + } - public Set convertToSSetRevisionRelated(Collection input) { - Set result = new HashSet(); - for (RevisionRelated o : input) { + public Set convertToSSetImmediateNotificationResult(Collection input) { + Set result = new HashSet(); + for (ImmediateNotificationResult o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetRevisionRelated(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SRevisionRelated o : input) { + public Set convertFromSSetImmediateNotificationResult(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SImmediateNotificationResult o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListRevisionRelated(Collection input) { - List result = new ArrayList(); - for (RevisionRelated o : input) { + public List convertToSListImmediateNotificationResult(Collection input) { + List result = new ArrayList(); + for (ImmediateNotificationResult o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListRevisionRelated(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SRevisionRelated o : input) { + public List convertFromSListImmediateNotificationResult(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SImmediateNotificationResult o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SRevisionRelated convertToSObject(RevisionRelated input) { + public SImmediateNotificationResult convertToSObject(ImmediateNotificationResult input) { if (input == null) { return null; } - if (input instanceof RevisionUpdated) { - return convertToSObject((RevisionUpdated)input); - } - else if (input instanceof NewRevisionAdded) { - return convertToSObject((NewRevisionAdded)input); - } - SRevisionRelated result = new SRevisionRelated(); + SImmediateNotificationResult result = new SImmediateNotificationResult(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - Revision revisionVal = input.getRevision(); - result.setRevisionId(revisionVal == null ? -1 : revisionVal.getOid()); + result.setResult(SNotifictionResultEnum.values()[input.getResult().ordinal()]); + result.setDescription(input.getDescription()); return result; } - public RevisionRelated convertFromSObject(SRevisionRelated input, DatabaseSession session) throws BimserverDatabaseException { + public ImmediateNotificationResult convertFromSObject(SImmediateNotificationResult input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - RevisionRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionRelated(), session); + ImmediateNotificationResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createImmediateNotificationResult(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -9617,209 +9571,144 @@ public RevisionRelated convertFromSObject(SRevisionRelated input, DatabaseSessio return result; } - public RevisionRelated convertFromSObject(SRevisionRelated input) throws BimserverDatabaseException { - RevisionRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionRelated(), null); + public ImmediateNotificationResult convertFromSObject(SImmediateNotificationResult input) throws BimserverDatabaseException { + ImmediateNotificationResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createImmediateNotificationResult(), null); return result; } - public RevisionRelated convertFromSObject(SRevisionRelated input, RevisionRelated result, DatabaseSession session) throws BimserverDatabaseException { + public ImmediateNotificationResult convertFromSObject(SImmediateNotificationResult input, ImmediateNotificationResult result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - if (input instanceof SRevisionUpdated) { - return convertFromSObject((SRevisionUpdated)input, session); - } - else if (input instanceof SNewRevisionAdded) { - return convertFromSObject((SNewRevisionAdded)input, session); - } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getRevisionId(), OldQuery.getDefault())); + result.setResult(NotifictionResultEnum.values()[input.getResult().ordinal()]); + result.setDescription(input.getDescription()); return result; } - public Set convertToSSetUserRelated(Collection input) { - Set result = new HashSet(); - for (UserRelated o : input) { + public Set convertToSSetRemoteServiceUpdate(Collection input) { + Set result = new HashSet(); + for (RemoteServiceUpdate o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetUserRelated(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SUserRelated o : input) { + public Set convertFromSSetRemoteServiceUpdate(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SRemoteServiceUpdate o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListUserRelated(Collection input) { - List result = new ArrayList(); - for (UserRelated o : input) { + public List convertToSListRemoteServiceUpdate(Collection input) { + List result = new ArrayList(); + for (RemoteServiceUpdate o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListUserRelated(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SUserRelated o : input) { + public List convertFromSListRemoteServiceUpdate(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SRemoteServiceUpdate o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SUserRelated convertToSObject(UserRelated input) { + public SRemoteServiceUpdate convertToSObject(RemoteServiceUpdate input) { if (input == null) { return null; } - if (input instanceof UserRemovedFromProject) { - return convertToSObject((UserRemovedFromProject)input); - } - else if (input instanceof UserAddedToProject) { - return convertToSObject((UserAddedToProject)input); - } - else if (input instanceof UserChanged) { - return convertToSObject((UserChanged)input); - } - else if (input instanceof PasswordReset) { - return convertToSObject((PasswordReset)input); - } - else if (input instanceof NewUserAdded) { - return convertToSObject((NewUserAdded)input); - } - else if (input instanceof UserDeleted) { - return convertToSObject((UserDeleted)input); - } - else if (input instanceof UserUndeleted) { - return convertToSObject((UserUndeleted)input); - } - else if (input instanceof PasswordChanged) { - return convertToSObject((PasswordChanged)input); + if (input instanceof PercentageChange) { + return convertToSObject((PercentageChange)input); } - SUserRelated result = new SUserRelated(); + SRemoteServiceUpdate result = new SRemoteServiceUpdate(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - User userVal = input.getUser(); - result.setUserId(userVal == null ? -1 : userVal.getOid()); return result; } - public UserRelated convertFromSObject(SUserRelated input, DatabaseSession session) throws BimserverDatabaseException { + public RemoteServiceUpdate convertFromSObject(SRemoteServiceUpdate input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { - throw new BimserverDatabaseException("session == null, use the other method"); - } - LOGGER.info("Potential unlinked object created"); - UserRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createUserRelated(), session); - - ((IdEObjectImpl)result).setOid(input.getOid()); - ((IdEObjectImpl)result).setRid(input.getRid()); - - return result; - } - - public UserRelated convertFromSObject(SUserRelated input) throws BimserverDatabaseException { - UserRelated result = convertFromSObject(input, LogFactory.eINSTANCE.createUserRelated(), null); - return result; - } - - public UserRelated convertFromSObject(SUserRelated input, UserRelated result, DatabaseSession session) throws BimserverDatabaseException { - if (input == null) { - return null; - } - if (input instanceof SUserRemovedFromProject) { - return convertFromSObject((SUserRemovedFromProject)input, session); - } - else if (input instanceof SUserAddedToProject) { - return convertFromSObject((SUserAddedToProject)input, session); - } - else if (input instanceof SUserChanged) { - return convertFromSObject((SUserChanged)input, session); - } - else if (input instanceof SPasswordReset) { - return convertFromSObject((SPasswordReset)input, session); - } - else if (input instanceof SNewUserAdded) { - return convertFromSObject((SNewUserAdded)input, session); - } - else if (input instanceof SUserDeleted) { - return convertFromSObject((SUserDeleted)input, session); + throw new BimserverDatabaseException("session == null, use the other method"); } - else if (input instanceof SUserUndeleted) { - return convertFromSObject((SUserUndeleted)input, session); + LOGGER.info("Potential unlinked object created"); + RemoteServiceUpdate result = convertFromSObject(input, StoreFactory.eINSTANCE.createRemoteServiceUpdate(), session); + + ((IdEObjectImpl)result).setOid(input.getOid()); + ((IdEObjectImpl)result).setRid(input.getRid()); + + return result; + } + + public RemoteServiceUpdate convertFromSObject(SRemoteServiceUpdate input) throws BimserverDatabaseException { + RemoteServiceUpdate result = convertFromSObject(input, StoreFactory.eINSTANCE.createRemoteServiceUpdate(), null); + return result; + } + + public RemoteServiceUpdate convertFromSObject(SRemoteServiceUpdate input, RemoteServiceUpdate result, DatabaseSession session) throws BimserverDatabaseException { + if (input == null) { + return null; } - else if (input instanceof SPasswordChanged) { - return convertFromSObject((SPasswordChanged)input, session); + if (input instanceof SPercentageChange) { + return convertFromSObject((SPercentageChange)input, session); } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); return result; } - public Set convertToSSetNewUserAdded(Collection input) { - Set result = new HashSet(); - for (NewUserAdded o : input) { + public Set convertToSSetPercentageChange(Collection input) { + Set result = new HashSet(); + for (PercentageChange o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetNewUserAdded(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SNewUserAdded o : input) { + public Set convertFromSSetPercentageChange(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SPercentageChange o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListNewUserAdded(Collection input) { - List result = new ArrayList(); - for (NewUserAdded o : input) { + public List convertToSListPercentageChange(Collection input) { + List result = new ArrayList(); + for (PercentageChange o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListNewUserAdded(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SNewUserAdded o : input) { + public List convertFromSListPercentageChange(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SPercentageChange o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SNewUserAdded convertToSObject(NewUserAdded input) { + public SPercentageChange convertToSObject(PercentageChange input) { if (input == null) { return null; } - SNewUserAdded result = new SNewUserAdded(); + SPercentageChange result = new SPercentageChange(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - User userVal = input.getUser(); - result.setUserId(userVal == null ? -1 : userVal.getOid()); + result.setPercentage(input.getPercentage()); return result; } - public NewUserAdded convertFromSObject(SNewUserAdded input, DatabaseSession session) throws BimserverDatabaseException { + public PercentageChange convertFromSObject(SPercentageChange input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - NewUserAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewUserAdded(), session); + PercentageChange result = convertFromSObject(input, StoreFactory.eINSTANCE.createPercentageChange(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -9827,79 +9716,75 @@ public NewUserAdded convertFromSObject(SNewUserAdded input, DatabaseSession sess return result; } - public NewUserAdded convertFromSObject(SNewUserAdded input) throws BimserverDatabaseException { - NewUserAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewUserAdded(), null); + public PercentageChange convertFromSObject(SPercentageChange input) throws BimserverDatabaseException { + PercentageChange result = convertFromSObject(input, StoreFactory.eINSTANCE.createPercentageChange(), null); return result; } - public NewUserAdded convertFromSObject(SNewUserAdded input, NewUserAdded result, DatabaseSession session) throws BimserverDatabaseException { + public PercentageChange convertFromSObject(SPercentageChange input, PercentageChange result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); + result.setPercentage(input.getPercentage()); return result; } - public Set convertToSSetNewProjectAdded(Collection input) { - Set result = new HashSet(); - for (NewProjectAdded o : input) { + public Set convertToSSetSystemInfo(Collection input) { + Set result = new HashSet(); + for (SystemInfo o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetNewProjectAdded(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SNewProjectAdded o : input) { + public Set convertFromSSetSystemInfo(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SSystemInfo o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListNewProjectAdded(Collection input) { - List result = new ArrayList(); - for (NewProjectAdded o : input) { + public List convertToSListSystemInfo(Collection input) { + List result = new ArrayList(); + for (SystemInfo o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListNewProjectAdded(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SNewProjectAdded o : input) { + public List convertFromSListSystemInfo(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SSystemInfo o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SNewProjectAdded convertToSObject(NewProjectAdded input) { + public SSystemInfo convertToSObject(SystemInfo input) { if (input == null) { return null; } - SNewProjectAdded result = new SNewProjectAdded(); + SSystemInfo result = new SSystemInfo(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - Project projectVal = input.getProject(); - result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); - Project parentProjectVal = input.getParentProject(); - result.setParentProjectId(parentProjectVal == null ? -1 : parentProjectVal.getOid()); + result.setCpucores(input.getCpucores()); + result.setDatetime(input.getDatetime()); + result.setOsname(input.getOsname()); + result.setOsversion(input.getOsversion()); + result.setUserName(input.getUserName()); + result.setUserHome(input.getUserHome()); + result.setUserDir(input.getUserDir()); return result; } - public NewProjectAdded convertFromSObject(SNewProjectAdded input, DatabaseSession session) throws BimserverDatabaseException { + public SystemInfo convertFromSObject(SSystemInfo input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - NewProjectAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewProjectAdded(), session); + SystemInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createSystemInfo(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -9907,80 +9792,97 @@ public NewProjectAdded convertFromSObject(SNewProjectAdded input, DatabaseSessio return result; } - public NewProjectAdded convertFromSObject(SNewProjectAdded input) throws BimserverDatabaseException { - NewProjectAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewProjectAdded(), null); + public SystemInfo convertFromSObject(SSystemInfo input) throws BimserverDatabaseException { + SystemInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createSystemInfo(), null); return result; } - public NewProjectAdded convertFromSObject(SNewProjectAdded input, NewProjectAdded result, DatabaseSession session) throws BimserverDatabaseException { + public SystemInfo convertFromSObject(SSystemInfo input, SystemInfo result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); - result.setParentProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getParentProjectId(), OldQuery.getDefault())); + result.setCpucores(input.getCpucores()); + result.setDatetime(input.getDatetime()); + result.setOsname(input.getOsname()); + result.setOsversion(input.getOsversion()); + result.setUserName(input.getUserName()); + result.setUserHome(input.getUserHome()); + result.setUserDir(input.getUserDir()); return result; } - public Set convertToSSetRevisionBranched(Collection input) { - Set result = new HashSet(); - for (RevisionBranched o : input) { + public Set convertToSSetJavaInfo(Collection input) { + Set result = new HashSet(); + for (JavaInfo o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetRevisionBranched(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SRevisionBranched o : input) { + public Set convertFromSSetJavaInfo(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SJavaInfo o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListRevisionBranched(Collection input) { - List result = new ArrayList(); - for (RevisionBranched o : input) { + public List convertToSListJavaInfo(Collection input) { + List result = new ArrayList(); + for (JavaInfo o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListRevisionBranched(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SRevisionBranched o : input) { + public List convertFromSListJavaInfo(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SJavaInfo o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SRevisionBranched convertToSObject(RevisionBranched input) { + public SJavaInfo convertToSObject(JavaInfo input) { if (input == null) { return null; } - SRevisionBranched result = new SRevisionBranched(); + SJavaInfo result = new SJavaInfo(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - Revision oldrevisionVal = input.getOldrevision(); - result.setOldrevisionId(oldrevisionVal == null ? -1 : oldrevisionVal.getOid()); - Revision newrevisionVal = input.getNewrevision(); - result.setNewrevisionId(newrevisionVal == null ? -1 : newrevisionVal.getOid()); + result.setHeapTotal(input.getHeapTotal()); + result.setHeapUsed(input.getHeapUsed()); + result.setHeapFree(input.getHeapFree()); + result.setHeapMax(input.getHeapMax()); + result.setThreads(input.getThreads()); + result.setJavaHome(input.getJavaHome()); + result.setJavaVersion(input.getJavaVersion()); + result.setJavaVendor(input.getJavaVendor()); + result.setJavaVendorurl(input.getJavaVendorurl()); + result.setJavavmVersion(input.getJavavmVersion()); + result.setJavavmVendor(input.getJavavmVendor()); + result.setJavavmName(input.getJavavmName()); + result.setJavaspecVersion(input.getJavaspecVersion()); + result.setJavaspecVendor(input.getJavaspecVendor()); + result.setJavaspecName(input.getJavaspecName()); + result.setJavaClassVersion(input.getJavaClassVersion()); + result.getJavaClasspath().addAll(input.getJavaClasspath()); + result.getJavaLibrarypath().addAll(input.getJavaLibrarypath()); + result.setJavaIoTmp(input.getJavaIoTmp()); + result.setJavaExtdir(input.getJavaExtdir()); + result.setJavaFileSeparator(input.getJavaFileSeparator()); + result.setJavaPathSeparator(input.getJavaPathSeparator()); + result.setJavaLineSeparator(input.getJavaLineSeparator()); return result; } - public RevisionBranched convertFromSObject(SRevisionBranched input, DatabaseSession session) throws BimserverDatabaseException { + public JavaInfo convertFromSObject(SJavaInfo input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - RevisionBranched result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionBranched(), session); + JavaInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createJavaInfo(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -9988,80 +9890,101 @@ public RevisionBranched convertFromSObject(SRevisionBranched input, DatabaseSess return result; } - public RevisionBranched convertFromSObject(SRevisionBranched input) throws BimserverDatabaseException { - RevisionBranched result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionBranched(), null); + public JavaInfo convertFromSObject(SJavaInfo input) throws BimserverDatabaseException { + JavaInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createJavaInfo(), null); return result; } - public RevisionBranched convertFromSObject(SRevisionBranched input, RevisionBranched result, DatabaseSession session) throws BimserverDatabaseException { + public JavaInfo convertFromSObject(SJavaInfo input, JavaInfo result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setOldrevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getOldrevisionId(), OldQuery.getDefault())); - result.setNewrevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getNewrevisionId(), OldQuery.getDefault())); + result.setHeapTotal(input.getHeapTotal()); + result.setHeapUsed(input.getHeapUsed()); + result.setHeapFree(input.getHeapFree()); + result.setHeapMax(input.getHeapMax()); + result.setThreads(input.getThreads()); + result.setJavaHome(input.getJavaHome()); + result.setJavaVersion(input.getJavaVersion()); + result.setJavaVendor(input.getJavaVendor()); + result.setJavaVendorurl(input.getJavaVendorurl()); + result.setJavavmVersion(input.getJavavmVersion()); + result.setJavavmVendor(input.getJavavmVendor()); + result.setJavavmName(input.getJavavmName()); + result.setJavaspecVersion(input.getJavaspecVersion()); + result.setJavaspecVendor(input.getJavaspecVendor()); + result.setJavaspecName(input.getJavaspecName()); + result.setJavaClassVersion(input.getJavaClassVersion()); + result.getJavaClasspath().addAll(input.getJavaClasspath()); + result.getJavaLibrarypath().addAll(input.getJavaLibrarypath()); + result.setJavaIoTmp(input.getJavaIoTmp()); + result.setJavaExtdir(input.getJavaExtdir()); + result.setJavaFileSeparator(input.getJavaFileSeparator()); + result.setJavaPathSeparator(input.getJavaPathSeparator()); + result.setJavaLineSeparator(input.getJavaLineSeparator()); return result; } - public Set convertToSSetNewRevisionAdded(Collection input) { - Set result = new HashSet(); - for (NewRevisionAdded o : input) { + public Set convertToSSetBimServerInfo(Collection input) { + Set result = new HashSet(); + for (BimServerInfo o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetNewRevisionAdded(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SNewRevisionAdded o : input) { + public Set convertFromSSetBimServerInfo(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SBimServerInfo o : input) { result.add(convertFromSObject(o, session)); } return result; } - - public List convertToSListNewRevisionAdded(Collection input) { - List result = new ArrayList(); - for (NewRevisionAdded o : input) { + + public List convertToSListBimServerInfo(Collection input) { + List result = new ArrayList(); + for (BimServerInfo o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListNewRevisionAdded(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SNewRevisionAdded o : input) { + public List convertFromSListBimServerInfo(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SBimServerInfo o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SNewRevisionAdded convertToSObject(NewRevisionAdded input) { + public SBimServerInfo convertToSObject(BimServerInfo input) { if (input == null) { return null; } - SNewRevisionAdded result = new SNewRevisionAdded(); + SBimServerInfo result = new SBimServerInfo(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - Revision revisionVal = input.getRevision(); - result.setRevisionId(revisionVal == null ? -1 : revisionVal.getOid()); - Project projectVal = input.getProject(); - result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); + result.setCurrentVersion(input.getCurrentVersion()); + result.setCurrentDate(input.getCurrentDate()); + result.setSchemaVersion(input.getSchemaVersion()); + result.setLatestDate(input.getLatestDate()); + result.setLatestVersion(input.getLatestVersion()); + result.setProjects(input.getProjects()); + result.setRevisions(input.getRevisions()); + result.setUsers(input.getUsers()); + result.setCheckouts(input.getCheckouts()); + result.setServerLogUrl(input.getServerLogUrl()); + result.setStarted(input.getStarted()); return result; } - public NewRevisionAdded convertFromSObject(SNewRevisionAdded input, DatabaseSession session) throws BimserverDatabaseException { + public BimServerInfo convertFromSObject(SBimServerInfo input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - NewRevisionAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewRevisionAdded(), session); + BimServerInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createBimServerInfo(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -10069,78 +9992,93 @@ public NewRevisionAdded convertFromSObject(SNewRevisionAdded input, DatabaseSess return result; } - public NewRevisionAdded convertFromSObject(SNewRevisionAdded input) throws BimserverDatabaseException { - NewRevisionAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewRevisionAdded(), null); + public BimServerInfo convertFromSObject(SBimServerInfo input) throws BimserverDatabaseException { + BimServerInfo result = convertFromSObject(input, StoreFactory.eINSTANCE.createBimServerInfo(), null); return result; } - public NewRevisionAdded convertFromSObject(SNewRevisionAdded input, NewRevisionAdded result, DatabaseSession session) throws BimserverDatabaseException { + public BimServerInfo convertFromSObject(SBimServerInfo input, BimServerInfo result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getRevisionId(), OldQuery.getDefault())); - result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); + result.setCurrentVersion(input.getCurrentVersion()); + result.setCurrentDate(input.getCurrentDate()); + result.setSchemaVersion(input.getSchemaVersion()); + result.setLatestDate(input.getLatestDate()); + result.setLatestVersion(input.getLatestVersion()); + result.setProjects(input.getProjects()); + result.setRevisions(input.getRevisions()); + result.setUsers(input.getUsers()); + result.setCheckouts(input.getCheckouts()); + result.setServerLogUrl(input.getServerLogUrl()); + result.setStarted(input.getStarted()); return result; } + public SProgressTopicType convertToSObject(ProgressTopicType input) { + return SProgressTopicType.values()[input.ordinal()]; + } + + public ProgressTopicType convertFromSObject(SProgressTopicType input) { + return ProgressTopicType.values()[input.ordinal()]; + } - public Set convertToSSetNewCheckoutAdded(Collection input) { - Set result = new HashSet(); - for (NewCheckoutAdded o : input) { + public Set convertToSSetProjectSmall(Collection input) { + Set result = new HashSet(); + for (ProjectSmall o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetNewCheckoutAdded(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SNewCheckoutAdded o : input) { + public Set convertFromSSetProjectSmall(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SProjectSmall o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListNewCheckoutAdded(Collection input) { - List result = new ArrayList(); - for (NewCheckoutAdded o : input) { + public List convertToSListProjectSmall(Collection input) { + List result = new ArrayList(); + for (ProjectSmall o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListNewCheckoutAdded(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SNewCheckoutAdded o : input) { + public List convertFromSListProjectSmall(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SProjectSmall o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SNewCheckoutAdded convertToSObject(NewCheckoutAdded input) { + public SProjectSmall convertToSObject(ProjectSmall input) { if (input == null) { return null; } - SNewCheckoutAdded result = new SNewCheckoutAdded(); + SProjectSmall result = new SProjectSmall(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - Checkout checkoutVal = input.getCheckout(); - result.setCheckoutId(checkoutVal == null ? -1 : checkoutVal.getOid()); + result.setName(input.getName()); + result.setParentId(input.getParentId()); + result.setState(SObjectState.values()[input.getState().ordinal()]); + result.setNrRevisions(input.getNrRevisions()); + result.setNrSubProjects(input.getNrSubProjects()); + result.setHasCheckinRights(input.isHasCheckinRights()); + result.setLastRevisionId(input.getLastRevisionId()); + result.setSchema(input.getSchema()); return result; } - public NewCheckoutAdded convertFromSObject(SNewCheckoutAdded input, DatabaseSession session) throws BimserverDatabaseException { + public ProjectSmall convertFromSObject(SProjectSmall input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - NewCheckoutAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewCheckoutAdded(), session); + ProjectSmall result = convertFromSObject(input, StoreFactory.eINSTANCE.createProjectSmall(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -10148,75 +10086,85 @@ public NewCheckoutAdded convertFromSObject(SNewCheckoutAdded input, DatabaseSess return result; } - public NewCheckoutAdded convertFromSObject(SNewCheckoutAdded input) throws BimserverDatabaseException { - NewCheckoutAdded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewCheckoutAdded(), null); + public ProjectSmall convertFromSObject(SProjectSmall input) throws BimserverDatabaseException { + ProjectSmall result = convertFromSObject(input, StoreFactory.eINSTANCE.createProjectSmall(), null); return result; } - public NewCheckoutAdded convertFromSObject(SNewCheckoutAdded input, NewCheckoutAdded result, DatabaseSession session) throws BimserverDatabaseException { + public ProjectSmall convertFromSObject(SProjectSmall input, ProjectSmall result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setCheckout((Checkout)session.get(StorePackage.eINSTANCE.getCheckout(), input.getCheckoutId(), OldQuery.getDefault())); + result.setName(input.getName()); + result.setParentId(input.getParentId()); + result.setState(ObjectState.values()[input.getState().ordinal()]); + result.setNrRevisions(input.getNrRevisions()); + result.setNrSubProjects(input.getNrSubProjects()); + result.setHasCheckinRights(input.isHasCheckinRights()); + result.setLastRevisionId(input.getLastRevisionId()); + result.setSchema(input.getSchema()); return result; } - public Set convertToSSetSettingsSaved(Collection input) { - Set result = new HashSet(); - for (SettingsSaved o : input) { + public Set convertToSSetIfcHeader(Collection input) { + Set result = new HashSet(); + for (IfcHeader o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetSettingsSaved(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SSettingsSaved o : input) { + public Set convertFromSSetIfcHeader(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SIfcHeader o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListSettingsSaved(Collection input) { - List result = new ArrayList(); - for (SettingsSaved o : input) { + public List convertToSListIfcHeader(Collection input) { + List result = new ArrayList(); + for (IfcHeader o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListSettingsSaved(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SSettingsSaved o : input) { + public List convertFromSListIfcHeader(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SIfcHeader o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SSettingsSaved convertToSObject(SettingsSaved input) { + public SIfcHeader convertToSObject(IfcHeader input) { if (input == null) { return null; } - SSettingsSaved result = new SSettingsSaved(); + SIfcHeader result = new SIfcHeader(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + result.getDescription().addAll(input.getDescription()); + result.setImplementationLevel(input.getImplementationLevel()); + result.setFilename(input.getFilename()); + result.setTimeStamp(input.getTimeStamp()); + result.getAuthor().addAll(input.getAuthor()); + result.getOrganization().addAll(input.getOrganization()); + result.setPreProcessorVersion(input.getPreProcessorVersion()); + result.setOriginatingSystem(input.getOriginatingSystem()); + result.setIfcSchemaVersion(input.getIfcSchemaVersion()); + result.setAuthorization(input.getAuthorization()); return result; } - public SettingsSaved convertFromSObject(SSettingsSaved input, DatabaseSession session) throws BimserverDatabaseException { + public IfcHeader convertFromSObject(SIfcHeader input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - SettingsSaved result = convertFromSObject(input, LogFactory.eINSTANCE.createSettingsSaved(), session); + IfcHeader result = convertFromSObject(input, StoreFactory.eINSTANCE.createIfcHeader(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -10224,78 +10172,83 @@ public SettingsSaved convertFromSObject(SSettingsSaved input, DatabaseSession se return result; } - public SettingsSaved convertFromSObject(SSettingsSaved input) throws BimserverDatabaseException { - SettingsSaved result = convertFromSObject(input, LogFactory.eINSTANCE.createSettingsSaved(), null); + public IfcHeader convertFromSObject(SIfcHeader input) throws BimserverDatabaseException { + IfcHeader result = convertFromSObject(input, StoreFactory.eINSTANCE.createIfcHeader(), null); return result; } - public SettingsSaved convertFromSObject(SSettingsSaved input, SettingsSaved result, DatabaseSession session) throws BimserverDatabaseException { + public IfcHeader convertFromSObject(SIfcHeader input, IfcHeader result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.getDescription().addAll(input.getDescription()); + result.setImplementationLevel(input.getImplementationLevel()); + result.setFilename(input.getFilename()); + result.setTimeStamp(input.getTimeStamp()); + result.getAuthor().addAll(input.getAuthor()); + result.getOrganization().addAll(input.getOrganization()); + result.setPreProcessorVersion(input.getPreProcessorVersion()); + result.setOriginatingSystem(input.getOriginatingSystem()); + result.setIfcSchemaVersion(input.getIfcSchemaVersion()); + result.setAuthorization(input.getAuthorization()); return result; } - public Set convertToSSetUserAddedToProject(Collection input) { - Set result = new HashSet(); - for (UserAddedToProject o : input) { + public Set convertToSSetModelCheckerResultItem(Collection input) { + Set result = new HashSet(); + for (ModelCheckerResultItem o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetUserAddedToProject(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SUserAddedToProject o : input) { + public Set convertFromSSetModelCheckerResultItem(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SModelCheckerResultItem o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListUserAddedToProject(Collection input) { - List result = new ArrayList(); - for (UserAddedToProject o : input) { + public List convertToSListModelCheckerResultItem(Collection input) { + List result = new ArrayList(); + for (ModelCheckerResultItem o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListUserAddedToProject(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SUserAddedToProject o : input) { + public List convertFromSListModelCheckerResultItem(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SModelCheckerResultItem o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SUserAddedToProject convertToSObject(UserAddedToProject input) { + public SModelCheckerResultItem convertToSObject(ModelCheckerResultItem input) { if (input == null) { return null; } - SUserAddedToProject result = new SUserAddedToProject(); + if (input instanceof ModelCheckerResultHeader) { + return convertToSObject((ModelCheckerResultHeader)input); + } + else if (input instanceof ModelCheckerResultLine) { + return convertToSObject((ModelCheckerResultLine)input); + } + SModelCheckerResultItem result = new SModelCheckerResultItem(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - User userVal = input.getUser(); - result.setUserId(userVal == null ? -1 : userVal.getOid()); - Project projectVal = input.getProject(); - result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); return result; } - public UserAddedToProject convertFromSObject(SUserAddedToProject input, DatabaseSession session) throws BimserverDatabaseException { + public ModelCheckerResultItem convertFromSObject(SModelCheckerResultItem input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - UserAddedToProject result = convertFromSObject(input, LogFactory.eINSTANCE.createUserAddedToProject(), session); + ModelCheckerResultItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultItem(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -10303,76 +10256,74 @@ public UserAddedToProject convertFromSObject(SUserAddedToProject input, Database return result; } - public UserAddedToProject convertFromSObject(SUserAddedToProject input) throws BimserverDatabaseException { - UserAddedToProject result = convertFromSObject(input, LogFactory.eINSTANCE.createUserAddedToProject(), null); + public ModelCheckerResultItem convertFromSObject(SModelCheckerResultItem input) throws BimserverDatabaseException { + ModelCheckerResultItem result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultItem(), null); return result; } - public UserAddedToProject convertFromSObject(SUserAddedToProject input, UserAddedToProject result, DatabaseSession session) throws BimserverDatabaseException { + public ModelCheckerResultItem convertFromSObject(SModelCheckerResultItem input, ModelCheckerResultItem result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); - result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); + if (input instanceof SModelCheckerResultHeader) { + return convertFromSObject((SModelCheckerResultHeader)input, session); + } + else if (input instanceof SModelCheckerResultLine) { + return convertFromSObject((SModelCheckerResultLine)input, session); + } return result; } - public Set convertToSSetNewObjectIDMUploaded(Collection input) { - Set result = new HashSet(); - for (NewObjectIDMUploaded o : input) { + public Set convertToSSetModelCheckerResultHeader(Collection input) { + Set result = new HashSet(); + for (ModelCheckerResultHeader o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetNewObjectIDMUploaded(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SNewObjectIDMUploaded o : input) { + public Set convertFromSSetModelCheckerResultHeader(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SModelCheckerResultHeader o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListNewObjectIDMUploaded(Collection input) { - List result = new ArrayList(); - for (NewObjectIDMUploaded o : input) { + public List convertToSListModelCheckerResultHeader(Collection input) { + List result = new ArrayList(); + for (ModelCheckerResultHeader o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListNewObjectIDMUploaded(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SNewObjectIDMUploaded o : input) { + public List convertFromSListModelCheckerResultHeader(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SModelCheckerResultHeader o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SNewObjectIDMUploaded convertToSObject(NewObjectIDMUploaded input) { + public SModelCheckerResultHeader convertToSObject(ModelCheckerResultHeader input) { if (input == null) { return null; } - SNewObjectIDMUploaded result = new SNewObjectIDMUploaded(); + SModelCheckerResultHeader result = new SModelCheckerResultHeader(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + result.setText(input.getText()); return result; } - public NewObjectIDMUploaded convertFromSObject(SNewObjectIDMUploaded input, DatabaseSession session) throws BimserverDatabaseException { + public ModelCheckerResultHeader convertFromSObject(SModelCheckerResultHeader input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - NewObjectIDMUploaded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewObjectIDMUploaded(), session); + ModelCheckerResultHeader result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultHeader(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -10380,74 +10331,80 @@ public NewObjectIDMUploaded convertFromSObject(SNewObjectIDMUploaded input, Data return result; } - public NewObjectIDMUploaded convertFromSObject(SNewObjectIDMUploaded input) throws BimserverDatabaseException { - NewObjectIDMUploaded result = convertFromSObject(input, LogFactory.eINSTANCE.createNewObjectIDMUploaded(), null); + public ModelCheckerResultHeader convertFromSObject(SModelCheckerResultHeader input) throws BimserverDatabaseException { + ModelCheckerResultHeader result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultHeader(), null); return result; } - public NewObjectIDMUploaded convertFromSObject(SNewObjectIDMUploaded input, NewObjectIDMUploaded result, DatabaseSession session) throws BimserverDatabaseException { + public ModelCheckerResultHeader convertFromSObject(SModelCheckerResultHeader input, ModelCheckerResultHeader result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setText(input.getText()); return result; } + public SModelCheckerResultType convertToSObject(ModelCheckerResultType input) { + return SModelCheckerResultType.values()[input.ordinal()]; + } + + public ModelCheckerResultType convertFromSObject(SModelCheckerResultType input) { + return ModelCheckerResultType.values()[input.ordinal()]; + } - public Set convertToSSetDownload(Collection input) { - Set result = new HashSet(); - for (Download o : input) { + public Set convertToSSetModelCheckerResultLine(Collection input) { + Set result = new HashSet(); + for (ModelCheckerResultLine o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetDownload(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SDownload o : input) { + public Set convertFromSSetModelCheckerResultLine(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SModelCheckerResultLine o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListDownload(Collection input) { - List result = new ArrayList(); - for (Download o : input) { + public List convertToSListModelCheckerResultLine(Collection input) { + List result = new ArrayList(); + for (ModelCheckerResultLine o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListDownload(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SDownload o : input) { + public List convertFromSListModelCheckerResultLine(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SModelCheckerResultLine o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SDownload convertToSObject(Download input) { + public SModelCheckerResultLine convertToSObject(ModelCheckerResultLine input) { if (input == null) { return null; } - SDownload result = new SDownload(); + SModelCheckerResultLine result = new SModelCheckerResultLine(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + result.setFieldOrClass(input.getFieldOrClass()); + result.setValue(input.getValue()); + result.setShouldBe(input.getShouldBe()); + result.setType(SModelCheckerResultType.values()[input.getType().ordinal()]); + result.setObjectId(input.getObjectId()); return result; } - public Download convertFromSObject(SDownload input, DatabaseSession session) throws BimserverDatabaseException { + public ModelCheckerResultLine convertFromSObject(SModelCheckerResultLine input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - Download result = convertFromSObject(input, LogFactory.eINSTANCE.createDownload(), session); + ModelCheckerResultLine result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultLine(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -10455,78 +10412,78 @@ public Download convertFromSObject(SDownload input, DatabaseSession session) thr return result; } - public Download convertFromSObject(SDownload input) throws BimserverDatabaseException { - Download result = convertFromSObject(input, LogFactory.eINSTANCE.createDownload(), null); + public ModelCheckerResultLine convertFromSObject(SModelCheckerResultLine input) throws BimserverDatabaseException { + ModelCheckerResultLine result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResultLine(), null); return result; } - public Download convertFromSObject(SDownload input, Download result, DatabaseSession session) throws BimserverDatabaseException { + public ModelCheckerResultLine convertFromSObject(SModelCheckerResultLine input, ModelCheckerResultLine result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setFieldOrClass(input.getFieldOrClass()); + result.setValue(input.getValue()); + result.setShouldBe(input.getShouldBe()); + result.setType(ModelCheckerResultType.values()[input.getType().ordinal()]); + result.setObjectId(input.getObjectId()); return result; } - public Set convertToSSetUserRemovedFromProject(Collection input) { - Set result = new HashSet(); - for (UserRemovedFromProject o : input) { + public Set convertToSSetModelCheckerResult(Collection input) { + Set result = new HashSet(); + for (ModelCheckerResult o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetUserRemovedFromProject(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SUserRemovedFromProject o : input) { + public Set convertFromSSetModelCheckerResult(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SModelCheckerResult o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListUserRemovedFromProject(Collection input) { - List result = new ArrayList(); - for (UserRemovedFromProject o : input) { + public List convertToSListModelCheckerResult(Collection input) { + List result = new ArrayList(); + for (ModelCheckerResult o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListUserRemovedFromProject(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SUserRemovedFromProject o : input) { + public List convertFromSListModelCheckerResult(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SModelCheckerResult o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SUserRemovedFromProject convertToSObject(UserRemovedFromProject input) { + public SModelCheckerResult convertToSObject(ModelCheckerResult input) { if (input == null) { return null; } - SUserRemovedFromProject result = new SUserRemovedFromProject(); + SModelCheckerResult result = new SModelCheckerResult(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - User userVal = input.getUser(); - result.setUserId(userVal == null ? -1 : userVal.getOid()); - Project projectVal = input.getProject(); - result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); + result.setValid(input.isValid()); + List listitems = new ArrayList(); + for (ModelCheckerResultItem v : input.getItems()) { + listitems.add(v.getOid()); + } + result.setItems(listitems); return result; } - public UserRemovedFromProject convertFromSObject(SUserRemovedFromProject input, DatabaseSession session) throws BimserverDatabaseException { + public ModelCheckerResult convertFromSObject(SModelCheckerResult input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - UserRemovedFromProject result = convertFromSObject(input, LogFactory.eINSTANCE.createUserRemovedFromProject(), session); + ModelCheckerResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResult(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -10534,78 +10491,78 @@ public UserRemovedFromProject convertFromSObject(SUserRemovedFromProject input, return result; } - public UserRemovedFromProject convertFromSObject(SUserRemovedFromProject input) throws BimserverDatabaseException { - UserRemovedFromProject result = convertFromSObject(input, LogFactory.eINSTANCE.createUserRemovedFromProject(), null); + public ModelCheckerResult convertFromSObject(SModelCheckerResult input) throws BimserverDatabaseException { + ModelCheckerResult result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerResult(), null); return result; } - public UserRemovedFromProject convertFromSObject(SUserRemovedFromProject input, UserRemovedFromProject result, DatabaseSession session) throws BimserverDatabaseException { + public ModelCheckerResult convertFromSObject(SModelCheckerResult input, ModelCheckerResult result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); - result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); + result.setValid(input.isValid()); + List listitems = result.getItems(); + for (long oid : input.getItems()) { + listitems.add((ModelCheckerResultItem)session.get(StorePackage.eINSTANCE.getModelCheckerResultItem(), oid, OldQuery.getDefault())); + } return result; } - public Set convertToSSetProjectDeleted(Collection input) { - Set result = new HashSet(); - for (ProjectDeleted o : input) { + public Set convertToSSetModelCheckerInstance(Collection input) { + Set result = new HashSet(); + for (ModelCheckerInstance o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetProjectDeleted(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SProjectDeleted o : input) { + public Set convertFromSSetModelCheckerInstance(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SModelCheckerInstance o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListProjectDeleted(Collection input) { - List result = new ArrayList(); - for (ProjectDeleted o : input) { + public List convertToSListModelCheckerInstance(Collection input) { + List result = new ArrayList(); + for (ModelCheckerInstance o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListProjectDeleted(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SProjectDeleted o : input) { + public List convertFromSListModelCheckerInstance(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SModelCheckerInstance o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SProjectDeleted convertToSObject(ProjectDeleted input) { + public SModelCheckerInstance convertToSObject(ModelCheckerInstance input) { if (input == null) { return null; } - SProjectDeleted result = new SProjectDeleted(); + SModelCheckerInstance result = new SModelCheckerInstance(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - Project projectVal = input.getProject(); - result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); + result.setName(input.getName()); + result.setDescription(input.getDescription()); + result.setCode(input.getCode()); + result.setCompiled(input.getCompiled()); + result.setValid(input.isValid()); + result.setModelCheckerPluginClassName(input.getModelCheckerPluginClassName()); return result; } - public ProjectDeleted convertFromSObject(SProjectDeleted input, DatabaseSession session) throws BimserverDatabaseException { + public ModelCheckerInstance convertFromSObject(SModelCheckerInstance input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ProjectDeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectDeleted(), session); + ModelCheckerInstance result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerInstance(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -10613,77 +10570,94 @@ public ProjectDeleted convertFromSObject(SProjectDeleted input, DatabaseSession return result; } - public ProjectDeleted convertFromSObject(SProjectDeleted input) throws BimserverDatabaseException { - ProjectDeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectDeleted(), null); + public ModelCheckerInstance convertFromSObject(SModelCheckerInstance input) throws BimserverDatabaseException { + ModelCheckerInstance result = convertFromSObject(input, StoreFactory.eINSTANCE.createModelCheckerInstance(), null); return result; } - public ProjectDeleted convertFromSObject(SProjectDeleted input, ProjectDeleted result, DatabaseSession session) throws BimserverDatabaseException { + public ModelCheckerInstance convertFromSObject(SModelCheckerInstance input, ModelCheckerInstance result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); + result.setName(input.getName()); + result.setDescription(input.getDescription()); + result.setCode(input.getCode()); + result.setCompiled(input.getCompiled()); + result.setValid(input.isValid()); + result.setModelCheckerPluginClassName(input.getModelCheckerPluginClassName()); return result; } + public SSmtpProtocol convertToSObject(SmtpProtocol input) { + return SSmtpProtocol.values()[input.ordinal()]; + } + + public SmtpProtocol convertFromSObject(SSmtpProtocol input) { + return SmtpProtocol.values()[input.ordinal()]; + } - public Set convertToSSetUserDeleted(Collection input) { - Set result = new HashSet(); - for (UserDeleted o : input) { + public Set convertToSSetMessagingSerializerPluginConfiguration(Collection input) { + Set result = new HashSet(); + for (MessagingSerializerPluginConfiguration o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetUserDeleted(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SUserDeleted o : input) { + public Set convertFromSSetMessagingSerializerPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SMessagingSerializerPluginConfiguration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListUserDeleted(Collection input) { - List result = new ArrayList(); - for (UserDeleted o : input) { + public List convertToSListMessagingSerializerPluginConfiguration(Collection input) { + List result = new ArrayList(); + for (MessagingSerializerPluginConfiguration o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListUserDeleted(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SUserDeleted o : input) { + public List convertFromSListMessagingSerializerPluginConfiguration(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SMessagingSerializerPluginConfiguration o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SUserDeleted convertToSObject(UserDeleted input) { + public SMessagingSerializerPluginConfiguration convertToSObject(MessagingSerializerPluginConfiguration input) { if (input == null) { return null; } - SUserDeleted result = new SUserDeleted(); + SMessagingSerializerPluginConfiguration result = new SMessagingSerializerPluginConfiguration(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - User userVal = input.getUser(); - result.setUserId(userVal == null ? -1 : userVal.getOid()); + result.setName(input.getName()); + result.setEnabled(input.getEnabled()); + result.setDescription(input.getDescription()); + result.setStreaming(input.isStreaming()); + PluginDescriptor pluginDescriptorVal = input.getPluginDescriptor(); + result.setPluginDescriptorId(pluginDescriptorVal == null ? -1 : pluginDescriptorVal.getOid()); + ObjectType settingsVal = input.getSettings(); + result.setSettingsId(settingsVal == null ? -1 : settingsVal.getOid()); + ObjectIDMPluginConfiguration objectIDMVal = input.getObjectIDM(); + result.setObjectIDMId(objectIDMVal == null ? -1 : objectIDMVal.getOid()); + UserSettings userSettingsVal = input.getUserSettings(); + result.setUserSettingsId(userSettingsVal == null ? -1 : userSettingsVal.getOid()); + RenderEnginePluginConfiguration renderEngineVal = input.getRenderEngine(); + result.setRenderEngineId(renderEngineVal == null ? -1 : renderEngineVal.getOid()); return result; } - public UserDeleted convertFromSObject(SUserDeleted input, DatabaseSession session) throws BimserverDatabaseException { + public MessagingSerializerPluginConfiguration convertFromSObject(SMessagingSerializerPluginConfiguration input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - UserDeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createUserDeleted(), session); + MessagingSerializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createMessagingSerializerPluginConfiguration(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -10691,77 +10665,81 @@ public UserDeleted convertFromSObject(SUserDeleted input, DatabaseSession sessio return result; } - public UserDeleted convertFromSObject(SUserDeleted input) throws BimserverDatabaseException { - UserDeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createUserDeleted(), null); + public MessagingSerializerPluginConfiguration convertFromSObject(SMessagingSerializerPluginConfiguration input) throws BimserverDatabaseException { + MessagingSerializerPluginConfiguration result = convertFromSObject(input, StoreFactory.eINSTANCE.createMessagingSerializerPluginConfiguration(), null); return result; } - public UserDeleted convertFromSObject(SUserDeleted input, UserDeleted result, DatabaseSession session) throws BimserverDatabaseException { + public MessagingSerializerPluginConfiguration convertFromSObject(SMessagingSerializerPluginConfiguration input, MessagingSerializerPluginConfiguration result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); + result.setName(input.getName()); + result.setEnabled(input.getEnabled()); + result.setDescription(input.getDescription()); + result.setStreaming(input.isStreaming()); + result.setPluginDescriptor((PluginDescriptor)session.get(StorePackage.eINSTANCE.getPluginDescriptor(), input.getPluginDescriptorId(), OldQuery.getDefault())); + result.setSettings((ObjectType)session.get(StorePackage.eINSTANCE.getObjectType(), input.getSettingsId(), OldQuery.getDefault())); + result.setObjectIDM((ObjectIDMPluginConfiguration)session.get(StorePackage.eINSTANCE.getObjectIDMPluginConfiguration(), input.getObjectIDMId(), OldQuery.getDefault())); + result.setUserSettings((UserSettings)session.get(StorePackage.eINSTANCE.getUserSettings(), input.getUserSettingsId(), OldQuery.getDefault())); + result.setRenderEngine((RenderEnginePluginConfiguration)session.get(StorePackage.eINSTANCE.getRenderEnginePluginConfiguration(), input.getRenderEngineId(), OldQuery.getDefault())); return result; } - public Set convertToSSetPasswordReset(Collection input) { - Set result = new HashSet(); - for (PasswordReset o : input) { + public Set convertToSSetMetrics(Collection input) { + Set result = new HashSet(); + for (Metrics o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetPasswordReset(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SPasswordReset o : input) { + public Set convertFromSSetMetrics(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SMetrics o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListPasswordReset(Collection input) { - List result = new ArrayList(); - for (PasswordReset o : input) { + public List convertToSListMetrics(Collection input) { + List result = new ArrayList(); + for (Metrics o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListPasswordReset(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SPasswordReset o : input) { + public List convertFromSListMetrics(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SMetrics o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SPasswordReset convertToSObject(PasswordReset input) { + public SMetrics convertToSObject(Metrics input) { if (input == null) { return null; } - SPasswordReset result = new SPasswordReset(); + SMetrics result = new SMetrics(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - User userVal = input.getUser(); - result.setUserId(userVal == null ? -1 : userVal.getOid()); + List listinterfaces = new ArrayList(); + for (InterfaceMetric v : input.getInterfaces()) { + listinterfaces.add(convertToSObject(v)); + } + result.setInterfaces(listinterfaces); return result; } - public PasswordReset convertFromSObject(SPasswordReset input, DatabaseSession session) throws BimserverDatabaseException { + public Metrics convertFromSObject(SMetrics input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - PasswordReset result = convertFromSObject(input, LogFactory.eINSTANCE.createPasswordReset(), session); + Metrics result = convertFromSObject(input, StoreFactory.eINSTANCE.createMetrics(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -10769,77 +10747,77 @@ public PasswordReset convertFromSObject(SPasswordReset input, DatabaseSession se return result; } - public PasswordReset convertFromSObject(SPasswordReset input) throws BimserverDatabaseException { - PasswordReset result = convertFromSObject(input, LogFactory.eINSTANCE.createPasswordReset(), null); + public Metrics convertFromSObject(SMetrics input) throws BimserverDatabaseException { + Metrics result = convertFromSObject(input, StoreFactory.eINSTANCE.createMetrics(), null); return result; } - public PasswordReset convertFromSObject(SPasswordReset input, PasswordReset result, DatabaseSession session) throws BimserverDatabaseException { + public Metrics convertFromSObject(SMetrics input, Metrics result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); + List listinterfaces = result.getInterfaces(); + for (SInterfaceMetric v : input.getInterfaces()) { + listinterfaces.add(convertFromSObject(v, session)); + } return result; } - public Set convertToSSetDatabaseCreated(Collection input) { - Set result = new HashSet(); - for (DatabaseCreated o : input) { + public Set convertToSSetInterfaceMetric(Collection input) { + Set result = new HashSet(); + for (InterfaceMetric o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetDatabaseCreated(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SDatabaseCreated o : input) { + public Set convertFromSSetInterfaceMetric(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SInterfaceMetric o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListDatabaseCreated(Collection input) { - List result = new ArrayList(); - for (DatabaseCreated o : input) { + public List convertToSListInterfaceMetric(Collection input) { + List result = new ArrayList(); + for (InterfaceMetric o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListDatabaseCreated(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SDatabaseCreated o : input) { + public List convertFromSListInterfaceMetric(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SInterfaceMetric o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SDatabaseCreated convertToSObject(DatabaseCreated input) { + public SInterfaceMetric convertToSObject(InterfaceMetric input) { if (input == null) { return null; } - SDatabaseCreated result = new SDatabaseCreated(); + SInterfaceMetric result = new SInterfaceMetric(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setPath(input.getPath()); - result.setVersion(input.getVersion()); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + result.setName(input.getName()); + List listmethods = new ArrayList(); + for (MethodMetric v : input.getMethods()) { + listmethods.add(convertToSObject(v)); + } + result.setMethods(listmethods); return result; } - public DatabaseCreated convertFromSObject(SDatabaseCreated input, DatabaseSession session) throws BimserverDatabaseException { + public InterfaceMetric convertFromSObject(SInterfaceMetric input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - DatabaseCreated result = convertFromSObject(input, LogFactory.eINSTANCE.createDatabaseCreated(), session); + InterfaceMetric result = convertFromSObject(input, StoreFactory.eINSTANCE.createInterfaceMetric(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -10847,76 +10825,78 @@ public DatabaseCreated convertFromSObject(SDatabaseCreated input, DatabaseSessio return result; } - public DatabaseCreated convertFromSObject(SDatabaseCreated input) throws BimserverDatabaseException { - DatabaseCreated result = convertFromSObject(input, LogFactory.eINSTANCE.createDatabaseCreated(), null); + public InterfaceMetric convertFromSObject(SInterfaceMetric input) throws BimserverDatabaseException { + InterfaceMetric result = convertFromSObject(input, StoreFactory.eINSTANCE.createInterfaceMetric(), null); return result; } - public DatabaseCreated convertFromSObject(SDatabaseCreated input, DatabaseCreated result, DatabaseSession session) throws BimserverDatabaseException { + public InterfaceMetric convertFromSObject(SInterfaceMetric input, InterfaceMetric result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setPath(input.getPath()); - result.setVersion(input.getVersion()); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setName(input.getName()); + List listmethods = result.getMethods(); + for (SMethodMetric v : input.getMethods()) { + listmethods.add(convertFromSObject(v, session)); + } return result; } - public Set convertToSSetServerStarted(Collection input) { - Set result = new HashSet(); - for (ServerStarted o : input) { + public Set convertToSSetMethodMetric(Collection input) { + Set result = new HashSet(); + for (MethodMetric o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetServerStarted(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SServerStarted o : input) { + public Set convertFromSSetMethodMetric(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SMethodMetric o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListServerStarted(Collection input) { - List result = new ArrayList(); - for (ServerStarted o : input) { + public List convertToSListMethodMetric(Collection input) { + List result = new ArrayList(); + for (MethodMetric o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListServerStarted(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SServerStarted o : input) { + public List convertFromSListMethodMetric(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SMethodMetric o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SServerStarted convertToSObject(ServerStarted input) { + public SMethodMetric convertToSObject(MethodMetric input) { if (input == null) { return null; } - SServerStarted result = new SServerStarted(); + SMethodMetric result = new SMethodMetric(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); + result.setName(input.getName()); + result.setNrCalls(input.getNrCalls()); + result.setLastCall(input.getLastCall()); + result.setAverageMs(input.getAverageMs()); + result.setShortestMs(input.getShortestMs()); + result.setLongestMs(input.getLongestMs()); return result; } - public ServerStarted convertFromSObject(SServerStarted input, DatabaseSession session) throws BimserverDatabaseException { + public MethodMetric convertFromSObject(SMethodMetric input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ServerStarted result = convertFromSObject(input, LogFactory.eINSTANCE.createServerStarted(), session); + MethodMetric result = convertFromSObject(input, StoreFactory.eINSTANCE.createMethodMetric(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -10924,76 +10904,84 @@ public ServerStarted convertFromSObject(SServerStarted input, DatabaseSession se return result; } - public ServerStarted convertFromSObject(SServerStarted input) throws BimserverDatabaseException { - ServerStarted result = convertFromSObject(input, LogFactory.eINSTANCE.createServerStarted(), null); + public MethodMetric convertFromSObject(SMethodMetric input) throws BimserverDatabaseException { + MethodMetric result = convertFromSObject(input, StoreFactory.eINSTANCE.createMethodMetric(), null); return result; } - public ServerStarted convertFromSObject(SServerStarted input, ServerStarted result, DatabaseSession session) throws BimserverDatabaseException { + public MethodMetric convertFromSObject(SMethodMetric input, MethodMetric result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); + result.setName(input.getName()); + result.setNrCalls(input.getNrCalls()); + result.setLastCall(input.getLastCall()); + result.setAverageMs(input.getAverageMs()); + result.setShortestMs(input.getShortestMs()); + result.setLongestMs(input.getLongestMs()); return result; } - public Set convertToSSetProjectUpdated(Collection input) { - Set result = new HashSet(); - for (ProjectUpdated o : input) { + public Set convertToSSetPluginBundleVersion(Collection input) { + Set result = new HashSet(); + for (PluginBundleVersion o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetProjectUpdated(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SProjectUpdated o : input) { + public Set convertFromSSetPluginBundleVersion(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SPluginBundleVersion o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListProjectUpdated(Collection input) { - List result = new ArrayList(); - for (ProjectUpdated o : input) { + public List convertToSListPluginBundleVersion(Collection input) { + List result = new ArrayList(); + for (PluginBundleVersion o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListProjectUpdated(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SProjectUpdated o : input) { + public List convertFromSListPluginBundleVersion(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SPluginBundleVersion o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SProjectUpdated convertToSObject(ProjectUpdated input) { + public SPluginBundleVersion convertToSObject(PluginBundleVersion input) { if (input == null) { return null; } - SProjectUpdated result = new SProjectUpdated(); + SPluginBundleVersion result = new SPluginBundleVersion(); result.setOid(input.getOid()); result.setRid(input.getRid()); + result.setVersion(input.getVersion()); + result.setType(SPluginBundleType.values()[input.getType().ordinal()]); + result.setDescription(input.getDescription()); + result.setMismatch(input.isMismatch()); + result.setRepository(input.getRepository()); + result.setGroupId(input.getGroupId()); + result.setArtifactId(input.getArtifactId()); + result.setIcon(input.getIcon()); + result.setOrganization(input.getOrganization()); + result.setName(input.getName()); result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - Project projectVal = input.getProject(); - result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); return result; } - public ProjectUpdated convertFromSObject(SProjectUpdated input, DatabaseSession session) throws BimserverDatabaseException { + public PluginBundleVersion convertFromSObject(SPluginBundleVersion input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ProjectUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectUpdated(), session); + PluginBundleVersion result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginBundleVersion(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -11001,77 +10989,103 @@ public ProjectUpdated convertFromSObject(SProjectUpdated input, DatabaseSession return result; } - public ProjectUpdated convertFromSObject(SProjectUpdated input) throws BimserverDatabaseException { - ProjectUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectUpdated(), null); + public PluginBundleVersion convertFromSObject(SPluginBundleVersion input) throws BimserverDatabaseException { + PluginBundleVersion result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginBundleVersion(), null); return result; } - public ProjectUpdated convertFromSObject(SProjectUpdated input, ProjectUpdated result, DatabaseSession session) throws BimserverDatabaseException { + public PluginBundleVersion convertFromSObject(SPluginBundleVersion input, PluginBundleVersion result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } + result.setVersion(input.getVersion()); + result.setType(PluginBundleType.values()[input.getType().ordinal()]); + result.setDescription(input.getDescription()); + result.setMismatch(input.isMismatch()); + result.setRepository(input.getRepository()); + result.setGroupId(input.getGroupId()); + result.setArtifactId(input.getArtifactId()); + result.setIcon(input.getIcon()); + result.setOrganization(input.getOrganization()); + result.setName(input.getName()); result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); return result; } + public SPluginBundleType convertToSObject(PluginBundleType input) { + return SPluginBundleType.values()[input.ordinal()]; + } + + public PluginBundleType convertFromSObject(SPluginBundleType input) { + return PluginBundleType.values()[input.ordinal()]; + } + public SPluginType convertToSObject(PluginType input) { + return SPluginType.values()[input.ordinal()]; + } + + public PluginType convertFromSObject(SPluginType input) { + return PluginType.values()[input.ordinal()]; + } - public Set convertToSSetUserUndeleted(Collection input) { - Set result = new HashSet(); - for (UserUndeleted o : input) { + public Set convertToSSetPluginBundle(Collection input) { + Set result = new HashSet(); + for (PluginBundle o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetUserUndeleted(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SUserUndeleted o : input) { + public Set convertFromSSetPluginBundle(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SPluginBundle o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListUserUndeleted(Collection input) { - List result = new ArrayList(); - for (UserUndeleted o : input) { + public List convertToSListPluginBundle(Collection input) { + List result = new ArrayList(); + for (PluginBundle o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListUserUndeleted(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SUserUndeleted o : input) { + public List convertFromSListPluginBundle(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SPluginBundle o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SUserUndeleted convertToSObject(UserUndeleted input) { + public SPluginBundle convertToSObject(PluginBundle input) { if (input == null) { return null; } - SUserUndeleted result = new SUserUndeleted(); + SPluginBundle result = new SPluginBundle(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - User userVal = input.getUser(); - result.setUserId(userVal == null ? -1 : userVal.getOid()); + result.setOrganization(input.getOrganization()); + result.setName(input.getName()); + PluginBundleVersion latestVersionVal = input.getLatestVersion(); + result.setLatestVersion(convertToSObject(latestVersionVal)); + List listavailableVersions = new ArrayList(); + for (PluginBundleVersion v : input.getAvailableVersions()) { + listavailableVersions.add(convertToSObject(v)); + } + result.setAvailableVersions(listavailableVersions); + PluginBundleVersion installedVersionVal = input.getInstalledVersion(); + result.setInstalledVersion(convertToSObject(installedVersionVal)); return result; } - public UserUndeleted convertFromSObject(SUserUndeleted input, DatabaseSession session) throws BimserverDatabaseException { + public PluginBundle convertFromSObject(SPluginBundle input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - UserUndeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createUserUndeleted(), session); + PluginBundle result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginBundle(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -11079,77 +11093,82 @@ public UserUndeleted convertFromSObject(SUserUndeleted input, DatabaseSession se return result; } - public UserUndeleted convertFromSObject(SUserUndeleted input) throws BimserverDatabaseException { - UserUndeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createUserUndeleted(), null); + public PluginBundle convertFromSObject(SPluginBundle input) throws BimserverDatabaseException { + PluginBundle result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginBundle(), null); return result; } - public UserUndeleted convertFromSObject(SUserUndeleted input, UserUndeleted result, DatabaseSession session) throws BimserverDatabaseException { + public PluginBundle convertFromSObject(SPluginBundle input, PluginBundle result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); + result.setOrganization(input.getOrganization()); + result.setName(input.getName()); + result.setLatestVersion(convertFromSObject(input.getLatestVersion(), session)); + List listavailableVersions = result.getAvailableVersions(); + for (SPluginBundleVersion v : input.getAvailableVersions()) { + listavailableVersions.add(convertFromSObject(v, session)); + } + result.setInstalledVersion(convertFromSObject(input.getInstalledVersion(), session)); return result; } - public Set convertToSSetProjectUndeleted(Collection input) { - Set result = new HashSet(); - for (ProjectUndeleted o : input) { + public Set convertToSSetPluginInformation(Collection input) { + Set result = new HashSet(); + for (PluginInformation o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetProjectUndeleted(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SProjectUndeleted o : input) { + public Set convertFromSSetPluginInformation(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SPluginInformation o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListProjectUndeleted(Collection input) { - List result = new ArrayList(); - for (ProjectUndeleted o : input) { + public List convertToSListPluginInformation(Collection input) { + List result = new ArrayList(); + for (PluginInformation o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListProjectUndeleted(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SProjectUndeleted o : input) { + public List convertFromSListPluginInformation(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SPluginInformation o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SProjectUndeleted convertToSObject(ProjectUndeleted input) { + public SPluginInformation convertToSObject(PluginInformation input) { if (input == null) { return null; } - SProjectUndeleted result = new SProjectUndeleted(); + SPluginInformation result = new SPluginInformation(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - Project projectVal = input.getProject(); - result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); + result.setName(input.getName()); + result.setType(SPluginType.values()[input.getType().ordinal()]); + result.setDescription(input.getDescription()); + result.setEnabled(input.isEnabled()); + result.setIdentifier(input.getIdentifier()); + result.setInstallForAllUsers(input.isInstallForAllUsers()); + result.setInstallForNewUsers(input.isInstallForNewUsers()); return result; } - public ProjectUndeleted convertFromSObject(SProjectUndeleted input, DatabaseSession session) throws BimserverDatabaseException { + public PluginInformation convertFromSObject(SPluginInformation input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ProjectUndeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectUndeleted(), session); + PluginInformation result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginInformation(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -11157,77 +11176,87 @@ public ProjectUndeleted convertFromSObject(SProjectUndeleted input, DatabaseSess return result; } - public ProjectUndeleted convertFromSObject(SProjectUndeleted input) throws BimserverDatabaseException { - ProjectUndeleted result = convertFromSObject(input, LogFactory.eINSTANCE.createProjectUndeleted(), null); + public PluginInformation convertFromSObject(SPluginInformation input) throws BimserverDatabaseException { + PluginInformation result = convertFromSObject(input, StoreFactory.eINSTANCE.createPluginInformation(), null); return result; } - public ProjectUndeleted convertFromSObject(SProjectUndeleted input, ProjectUndeleted result, DatabaseSession session) throws BimserverDatabaseException { + public PluginInformation convertFromSObject(SPluginInformation input, PluginInformation result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); + result.setName(input.getName()); + result.setType(PluginType.values()[input.getType().ordinal()]); + result.setDescription(input.getDescription()); + result.setEnabled(input.isEnabled()); + result.setIdentifier(input.getIdentifier()); + result.setInstallForAllUsers(input.isInstallForAllUsers()); + result.setInstallForNewUsers(input.isInstallForNewUsers()); return result; } - public Set convertToSSetRevisionUpdated(Collection input) { - Set result = new HashSet(); - for (RevisionUpdated o : input) { + public Set convertToSSetOAuthServer(Collection input) { + Set result = new HashSet(); + for (OAuthServer o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetRevisionUpdated(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SRevisionUpdated o : input) { + public Set convertFromSSetOAuthServer(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SOAuthServer o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListRevisionUpdated(Collection input) { - List result = new ArrayList(); - for (RevisionUpdated o : input) { + public List convertToSListOAuthServer(Collection input) { + List result = new ArrayList(); + for (OAuthServer o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListRevisionUpdated(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SRevisionUpdated o : input) { + public List convertFromSListOAuthServer(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SOAuthServer o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SRevisionUpdated convertToSObject(RevisionUpdated input) { + public SOAuthServer convertToSObject(OAuthServer input) { if (input == null) { return null; } - SRevisionUpdated result = new SRevisionUpdated(); + SOAuthServer result = new SOAuthServer(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - Revision revisionVal = input.getRevision(); - result.setRevisionId(revisionVal == null ? -1 : revisionVal.getOid()); + result.setRegistrationUrl(input.getRegistrationUrl()); + result.setClientId(input.getClientId()); + result.setClientSecret(input.getClientSecret()); + result.setClientName(input.getClientName()); + result.setClientIcon(input.getClientIcon()); + result.setClientUrl(input.getClientUrl()); + result.setClientDescription(input.getClientDescription()); + result.setRedirectUrl(input.getRedirectUrl()); + result.setExpiresAt(input.getExpiresAt()); + result.setIssuedAt(input.getIssuedAt()); + result.setIncoming(input.isIncoming()); + result.setApiUrl(input.getApiUrl()); + result.setRegistrationEndpoint(input.getRegistrationEndpoint()); return result; } - public RevisionUpdated convertFromSObject(SRevisionUpdated input, DatabaseSession session) throws BimserverDatabaseException { + public OAuthServer convertFromSObject(SOAuthServer input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - RevisionUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionUpdated(), session); + OAuthServer result = convertFromSObject(input, StoreFactory.eINSTANCE.createOAuthServer(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -11235,77 +11264,88 @@ public RevisionUpdated convertFromSObject(SRevisionUpdated input, DatabaseSessio return result; } - public RevisionUpdated convertFromSObject(SRevisionUpdated input) throws BimserverDatabaseException { - RevisionUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createRevisionUpdated(), null); + public OAuthServer convertFromSObject(SOAuthServer input) throws BimserverDatabaseException { + OAuthServer result = convertFromSObject(input, StoreFactory.eINSTANCE.createOAuthServer(), null); return result; } - public RevisionUpdated convertFromSObject(SRevisionUpdated input, RevisionUpdated result, DatabaseSession session) throws BimserverDatabaseException { + public OAuthServer convertFromSObject(SOAuthServer input, OAuthServer result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getRevisionId(), OldQuery.getDefault())); + result.setRegistrationUrl(input.getRegistrationUrl()); + result.setClientId(input.getClientId()); + result.setClientSecret(input.getClientSecret()); + result.setClientName(input.getClientName()); + result.setClientIcon(input.getClientIcon()); + result.setClientUrl(input.getClientUrl()); + result.setClientDescription(input.getClientDescription()); + result.setRedirectUrl(input.getRedirectUrl()); + result.setExpiresAt(input.getExpiresAt()); + result.setIssuedAt(input.getIssuedAt()); + result.setIncoming(input.isIncoming()); + result.setApiUrl(input.getApiUrl()); + result.setRegistrationEndpoint(input.getRegistrationEndpoint()); return result; } - public Set convertToSSetGeoTagUpdated(Collection input) { - Set result = new HashSet(); - for (GeoTagUpdated o : input) { + public Set convertToSSetOAuthAuthorizationCode(Collection input) { + Set result = new HashSet(); + for (OAuthAuthorizationCode o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetGeoTagUpdated(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SGeoTagUpdated o : input) { + public Set convertFromSSetOAuthAuthorizationCode(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SOAuthAuthorizationCode o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListGeoTagUpdated(Collection input) { - List result = new ArrayList(); - for (GeoTagUpdated o : input) { + public List convertToSListOAuthAuthorizationCode(Collection input) { + List result = new ArrayList(); + for (OAuthAuthorizationCode o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListGeoTagUpdated(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SGeoTagUpdated o : input) { + public List convertFromSListOAuthAuthorizationCode(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SOAuthAuthorizationCode o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SGeoTagUpdated convertToSObject(GeoTagUpdated input) { + public SOAuthAuthorizationCode convertToSObject(OAuthAuthorizationCode input) { if (input == null) { return null; } - SGeoTagUpdated result = new SGeoTagUpdated(); + SOAuthAuthorizationCode result = new SOAuthAuthorizationCode(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - GeoTag geoTagVal = input.getGeoTag(); - result.setGeoTagId(geoTagVal == null ? -1 : geoTagVal.getOid()); + result.setCode(input.getCode()); + result.setIssued(input.getIssued()); + OAuthServer oauthServerVal = input.getOauthServer(); + result.setOauthServerId(oauthServerVal == null ? -1 : oauthServerVal.getOid()); + Authorization authorizationVal = input.getAuthorization(); + result.setAuthorizationId(authorizationVal == null ? -1 : authorizationVal.getOid()); + User userVal = input.getUser(); + result.setUserId(userVal == null ? -1 : userVal.getOid()); return result; } - public GeoTagUpdated convertFromSObject(SGeoTagUpdated input, DatabaseSession session) throws BimserverDatabaseException { + public OAuthAuthorizationCode convertFromSObject(SOAuthAuthorizationCode input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - GeoTagUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createGeoTagUpdated(), session); + OAuthAuthorizationCode result = convertFromSObject(input, StoreFactory.eINSTANCE.createOAuthAuthorizationCode(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -11313,77 +11353,78 @@ public GeoTagUpdated convertFromSObject(SGeoTagUpdated input, DatabaseSession se return result; } - public GeoTagUpdated convertFromSObject(SGeoTagUpdated input) throws BimserverDatabaseException { - GeoTagUpdated result = convertFromSObject(input, LogFactory.eINSTANCE.createGeoTagUpdated(), null); + public OAuthAuthorizationCode convertFromSObject(SOAuthAuthorizationCode input) throws BimserverDatabaseException { + OAuthAuthorizationCode result = convertFromSObject(input, StoreFactory.eINSTANCE.createOAuthAuthorizationCode(), null); return result; } - public GeoTagUpdated convertFromSObject(SGeoTagUpdated input, GeoTagUpdated result, DatabaseSession session) throws BimserverDatabaseException { + public OAuthAuthorizationCode convertFromSObject(SOAuthAuthorizationCode input, OAuthAuthorizationCode result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setGeoTag((GeoTag)session.get(StorePackage.eINSTANCE.getGeoTag(), input.getGeoTagId(), OldQuery.getDefault())); + result.setCode(input.getCode()); + result.setIssued(input.getIssued()); + result.setOauthServer((OAuthServer)session.get(StorePackage.eINSTANCE.getOAuthServer(), input.getOauthServerId(), OldQuery.getDefault())); + result.setAuthorization((Authorization)session.get(StorePackage.eINSTANCE.getAuthorization(), input.getAuthorizationId(), OldQuery.getDefault())); + result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); return result; } - public Set convertToSSetPasswordChanged(Collection input) { - Set result = new HashSet(); - for (PasswordChanged o : input) { + public Set convertToSSetAuthorization(Collection input) { + Set result = new HashSet(); + for (Authorization o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetPasswordChanged(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SPasswordChanged o : input) { + public Set convertFromSSetAuthorization(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SAuthorization o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListPasswordChanged(Collection input) { - List result = new ArrayList(); - for (PasswordChanged o : input) { + public List convertToSListAuthorization(Collection input) { + List result = new ArrayList(); + for (Authorization o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListPasswordChanged(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SPasswordChanged o : input) { + public List convertFromSListAuthorization(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SAuthorization o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SPasswordChanged convertToSObject(PasswordChanged input) { + public SAuthorization convertToSObject(Authorization input) { if (input == null) { return null; } - SPasswordChanged result = new SPasswordChanged(); + if (input instanceof SingleProjectAuthorization) { + return convertToSObject((SingleProjectAuthorization)input); + } + else if (input instanceof RunServiceAuthorization) { + return convertToSObject((RunServiceAuthorization)input); + } + SAuthorization result = new SAuthorization(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - User userVal = input.getUser(); - result.setUserId(userVal == null ? -1 : userVal.getOid()); return result; } - public PasswordChanged convertFromSObject(SPasswordChanged input, DatabaseSession session) throws BimserverDatabaseException { + public Authorization convertFromSObject(SAuthorization input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - PasswordChanged result = convertFromSObject(input, LogFactory.eINSTANCE.createPasswordChanged(), session); + Authorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createAuthorization(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -11391,77 +11432,75 @@ public PasswordChanged convertFromSObject(SPasswordChanged input, DatabaseSessio return result; } - public PasswordChanged convertFromSObject(SPasswordChanged input) throws BimserverDatabaseException { - PasswordChanged result = convertFromSObject(input, LogFactory.eINSTANCE.createPasswordChanged(), null); + public Authorization convertFromSObject(SAuthorization input) throws BimserverDatabaseException { + Authorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createAuthorization(), null); return result; } - public PasswordChanged convertFromSObject(SPasswordChanged input, PasswordChanged result, DatabaseSession session) throws BimserverDatabaseException { + public Authorization convertFromSObject(SAuthorization input, Authorization result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); + if (input instanceof SSingleProjectAuthorization) { + return convertFromSObject((SSingleProjectAuthorization)input, session); + } + else if (input instanceof SRunServiceAuthorization) { + return convertFromSObject((SRunServiceAuthorization)input, session); + } return result; } - public Set convertToSSetUserChanged(Collection input) { - Set result = new HashSet(); - for (UserChanged o : input) { + public Set convertToSSetSingleProjectAuthorization(Collection input) { + Set result = new HashSet(); + for (SingleProjectAuthorization o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetUserChanged(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SUserChanged o : input) { + public Set convertFromSSetSingleProjectAuthorization(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SSingleProjectAuthorization o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListUserChanged(Collection input) { - List result = new ArrayList(); - for (UserChanged o : input) { + public List convertToSListSingleProjectAuthorization(Collection input) { + List result = new ArrayList(); + for (SingleProjectAuthorization o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListUserChanged(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SUserChanged o : input) { + public List convertFromSListSingleProjectAuthorization(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SSingleProjectAuthorization o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SUserChanged convertToSObject(UserChanged input) { + public SSingleProjectAuthorization convertToSObject(SingleProjectAuthorization input) { if (input == null) { return null; } - SUserChanged result = new SUserChanged(); + SSingleProjectAuthorization result = new SSingleProjectAuthorization(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - User userVal = input.getUser(); - result.setUserId(userVal == null ? -1 : userVal.getOid()); + Project projectVal = input.getProject(); + result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); return result; } - public UserChanged convertFromSObject(SUserChanged input, DatabaseSession session) throws BimserverDatabaseException { + public SingleProjectAuthorization convertFromSObject(SSingleProjectAuthorization input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - UserChanged result = convertFromSObject(input, LogFactory.eINSTANCE.createUserChanged(), session); + SingleProjectAuthorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createSingleProjectAuthorization(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -11469,79 +11508,77 @@ public UserChanged convertFromSObject(SUserChanged input, DatabaseSession sessio return result; } - public UserChanged convertFromSObject(SUserChanged input) throws BimserverDatabaseException { - UserChanged result = convertFromSObject(input, LogFactory.eINSTANCE.createUserChanged(), null); + public SingleProjectAuthorization convertFromSObject(SSingleProjectAuthorization input) throws BimserverDatabaseException { + SingleProjectAuthorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createSingleProjectAuthorization(), null); return result; } - public UserChanged convertFromSObject(SUserChanged input, UserChanged result, DatabaseSession session) throws BimserverDatabaseException { + public SingleProjectAuthorization convertFromSObject(SSingleProjectAuthorization input, SingleProjectAuthorization result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setUser((User)session.get(StorePackage.eINSTANCE.getUser(), input.getUserId(), OldQuery.getDefault())); + result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); return result; } - public Set convertToSSetExtendedDataAddedToRevision(Collection input) { - Set result = new HashSet(); - for (ExtendedDataAddedToRevision o : input) { + public Set convertToSSetNewServiceDescriptor(Collection input) { + Set result = new HashSet(); + for (NewServiceDescriptor o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetExtendedDataAddedToRevision(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SExtendedDataAddedToRevision o : input) { + public Set convertFromSSetNewServiceDescriptor(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SNewServiceDescriptor o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListExtendedDataAddedToRevision(Collection input) { - List result = new ArrayList(); - for (ExtendedDataAddedToRevision o : input) { + public List convertToSListNewServiceDescriptor(Collection input) { + List result = new ArrayList(); + for (NewServiceDescriptor o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListExtendedDataAddedToRevision(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SExtendedDataAddedToRevision o : input) { + public List convertFromSListNewServiceDescriptor(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SNewServiceDescriptor o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SExtendedDataAddedToRevision convertToSObject(ExtendedDataAddedToRevision input) { + public SNewServiceDescriptor convertToSObject(NewServiceDescriptor input) { if (input == null) { return null; } - SExtendedDataAddedToRevision result = new SExtendedDataAddedToRevision(); + SNewServiceDescriptor result = new SNewServiceDescriptor(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - Revision revisionVal = input.getRevision(); - result.setRevisionId(revisionVal == null ? -1 : revisionVal.getOid()); - ExtendedData extendedDataVal = input.getExtendedData(); - result.setExtendedDataId(extendedDataVal == null ? -1 : extendedDataVal.getOid()); + result.setName(input.getName()); + result.setDescription(input.getDescription()); + result.setProvider(input.getProvider()); + result.setAuthorizationUrl(input.getAuthorizationUrl()); + result.setTokenUrl(input.getTokenUrl()); + result.setResourceUrl(input.getResourceUrl()); + result.setRegisterUrl(input.getRegisterUrl()); + result.getInputs().addAll(input.getInputs()); + result.getOutputs().addAll(input.getOutputs()); return result; } - public ExtendedDataAddedToRevision convertFromSObject(SExtendedDataAddedToRevision input, DatabaseSession session) throws BimserverDatabaseException { + public NewServiceDescriptor convertFromSObject(SNewServiceDescriptor input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ExtendedDataAddedToRevision result = convertFromSObject(input, LogFactory.eINSTANCE.createExtendedDataAddedToRevision(), session); + NewServiceDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createNewServiceDescriptor(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -11549,80 +11586,82 @@ public ExtendedDataAddedToRevision convertFromSObject(SExtendedDataAddedToRevisi return result; } - public ExtendedDataAddedToRevision convertFromSObject(SExtendedDataAddedToRevision input) throws BimserverDatabaseException { - ExtendedDataAddedToRevision result = convertFromSObject(input, LogFactory.eINSTANCE.createExtendedDataAddedToRevision(), null); + public NewServiceDescriptor convertFromSObject(SNewServiceDescriptor input) throws BimserverDatabaseException { + NewServiceDescriptor result = convertFromSObject(input, StoreFactory.eINSTANCE.createNewServiceDescriptor(), null); return result; } - public ExtendedDataAddedToRevision convertFromSObject(SExtendedDataAddedToRevision input, ExtendedDataAddedToRevision result, DatabaseSession session) throws BimserverDatabaseException { + public NewServiceDescriptor convertFromSObject(SNewServiceDescriptor input, NewServiceDescriptor result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setRevision((Revision)session.get(StorePackage.eINSTANCE.getRevision(), input.getRevisionId(), OldQuery.getDefault())); - result.setExtendedData((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), input.getExtendedDataId(), OldQuery.getDefault())); + result.setName(input.getName()); + result.setDescription(input.getDescription()); + result.setProvider(input.getProvider()); + result.setAuthorizationUrl(input.getAuthorizationUrl()); + result.setTokenUrl(input.getTokenUrl()); + result.setResourceUrl(input.getResourceUrl()); + result.setRegisterUrl(input.getRegisterUrl()); + result.getInputs().addAll(input.getInputs()); + result.getOutputs().addAll(input.getOutputs()); return result; } - public Set convertToSSetExtendedDataAddedToProject(Collection input) { - Set result = new HashSet(); - for (ExtendedDataAddedToProject o : input) { + public Set convertToSSetFormatSerializerMap(Collection input) { + Set result = new HashSet(); + for (FormatSerializerMap o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetExtendedDataAddedToProject(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SExtendedDataAddedToProject o : input) { + public Set convertFromSSetFormatSerializerMap(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SFormatSerializerMap o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListExtendedDataAddedToProject(Collection input) { - List result = new ArrayList(); - for (ExtendedDataAddedToProject o : input) { + public List convertToSListFormatSerializerMap(Collection input) { + List result = new ArrayList(); + for (FormatSerializerMap o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListExtendedDataAddedToProject(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SExtendedDataAddedToProject o : input) { + public List convertFromSListFormatSerializerMap(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SFormatSerializerMap o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SExtendedDataAddedToProject convertToSObject(ExtendedDataAddedToProject input) { + public SFormatSerializerMap convertToSObject(FormatSerializerMap input) { if (input == null) { return null; } - SExtendedDataAddedToProject result = new SExtendedDataAddedToProject(); + SFormatSerializerMap result = new SFormatSerializerMap(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - Project projectVal = input.getProject(); - result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); - ExtendedData extendedDataVal = input.getExtendedData(); - result.setExtendedDataId(extendedDataVal == null ? -1 : extendedDataVal.getOid()); + result.setFormat(input.getFormat()); + List listserializers = new ArrayList(); + for (SerializerPluginConfiguration v : input.getSerializers()) { + listserializers.add(convertToSObject(v)); + } + result.setSerializers(listserializers); return result; } - public ExtendedDataAddedToProject convertFromSObject(SExtendedDataAddedToProject input, DatabaseSession session) throws BimserverDatabaseException { + public FormatSerializerMap convertFromSObject(SFormatSerializerMap input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - ExtendedDataAddedToProject result = convertFromSObject(input, LogFactory.eINSTANCE.createExtendedDataAddedToProject(), session); + FormatSerializerMap result = convertFromSObject(input, StoreFactory.eINSTANCE.createFormatSerializerMap(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -11630,83 +11669,78 @@ public ExtendedDataAddedToProject convertFromSObject(SExtendedDataAddedToProject return result; } - public ExtendedDataAddedToProject convertFromSObject(SExtendedDataAddedToProject input) throws BimserverDatabaseException { - ExtendedDataAddedToProject result = convertFromSObject(input, LogFactory.eINSTANCE.createExtendedDataAddedToProject(), null); + public FormatSerializerMap convertFromSObject(SFormatSerializerMap input) throws BimserverDatabaseException { + FormatSerializerMap result = convertFromSObject(input, StoreFactory.eINSTANCE.createFormatSerializerMap(), null); return result; } - public ExtendedDataAddedToProject convertFromSObject(SExtendedDataAddedToProject input, ExtendedDataAddedToProject result, DatabaseSession session) throws BimserverDatabaseException { + public FormatSerializerMap convertFromSObject(SFormatSerializerMap input, FormatSerializerMap result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); - result.setExtendedData((ExtendedData)session.get(StorePackage.eINSTANCE.getExtendedData(), input.getExtendedDataId(), OldQuery.getDefault())); + result.setFormat(input.getFormat()); + List listserializers = result.getSerializers(); + for (SSerializerPluginConfiguration v : input.getSerializers()) { + listserializers.add(convertFromSObject(v, session)); + } return result; } - public Set convertToSSetRemoteServiceCalled(Collection input) { - Set result = new HashSet(); - for (RemoteServiceCalled o : input) { + public Set convertToSSetAction(Collection input) { + Set result = new HashSet(); + for (Action o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetRemoteServiceCalled(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SRemoteServiceCalled o : input) { + public Set convertFromSSetAction(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SAction o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListRemoteServiceCalled(Collection input) { - List result = new ArrayList(); - for (RemoteServiceCalled o : input) { + public List convertToSListAction(Collection input) { + List result = new ArrayList(); + for (Action o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListRemoteServiceCalled(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SRemoteServiceCalled o : input) { + public List convertFromSListAction(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SAction o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SRemoteServiceCalled convertToSObject(RemoteServiceCalled input) { + public SAction convertToSObject(Action input) { if (input == null) { return null; } - SRemoteServiceCalled result = new SRemoteServiceCalled(); + if (input instanceof CheckinRevision) { + return convertToSObject((CheckinRevision)input); + } + else if (input instanceof StoreExtendedData) { + return convertToSObject((StoreExtendedData)input); + } + SAction result = new SAction(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setDate(input.getDate()); - result.setAccessMethod(SAccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setState(SNotifictionResultEnum.values()[input.getState().ordinal()]); - result.setPercentage(input.getPercentage()); - result.getInfos().addAll(input.getInfos()); - result.getWarnings().addAll(input.getWarnings()); - result.getErrors().addAll(input.getErrors()); - User executorVal = input.getExecutor(); - result.setExecutorId(executorVal == null ? -1 : executorVal.getOid()); - Service serviceVal = input.getService(); - result.setServiceId(serviceVal == null ? -1 : serviceVal.getOid()); return result; } - public RemoteServiceCalled convertFromSObject(SRemoteServiceCalled input, DatabaseSession session) throws BimserverDatabaseException { + public Action convertFromSObject(SAction input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - RemoteServiceCalled result = convertFromSObject(input, LogFactory.eINSTANCE.createRemoteServiceCalled(), session); + Action result = convertFromSObject(input, StoreFactory.eINSTANCE.createAction(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -11714,95 +11748,73 @@ public RemoteServiceCalled convertFromSObject(SRemoteServiceCalled input, Databa return result; } - public RemoteServiceCalled convertFromSObject(SRemoteServiceCalled input) throws BimserverDatabaseException { - RemoteServiceCalled result = convertFromSObject(input, LogFactory.eINSTANCE.createRemoteServiceCalled(), null); + public Action convertFromSObject(SAction input) throws BimserverDatabaseException { + Action result = convertFromSObject(input, StoreFactory.eINSTANCE.createAction(), null); return result; } - public RemoteServiceCalled convertFromSObject(SRemoteServiceCalled input, RemoteServiceCalled result, DatabaseSession session) throws BimserverDatabaseException { + public Action convertFromSObject(SAction input, Action result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setDate(input.getDate()); - result.setAccessMethod(AccessMethod.values()[input.getAccessMethod().ordinal()]); - result.setState(NotifictionResultEnum.values()[input.getState().ordinal()]); - result.setPercentage(input.getPercentage()); - result.getInfos().addAll(input.getInfos()); - result.getWarnings().addAll(input.getWarnings()); - result.getErrors().addAll(input.getErrors()); - result.setExecutor((User)session.get(StorePackage.eINSTANCE.getUser(), input.getExecutorId(), OldQuery.getDefault())); - result.setService((Service)session.get(StorePackage.eINSTANCE.getService(), input.getServiceId(), OldQuery.getDefault())); + if (input instanceof SCheckinRevision) { + return convertFromSObject((SCheckinRevision)input, session); + } + else if (input instanceof SStoreExtendedData) { + return convertFromSObject((SStoreExtendedData)input, session); + } return result; } - public Set convertToSSetGeometryInfo(Collection input) { - Set result = new HashSet(); - for (GeometryInfo o : input) { + public Set convertToSSetStoreExtendedData(Collection input) { + Set result = new HashSet(); + for (StoreExtendedData o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetGeometryInfo(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SGeometryInfo o : input) { + public Set convertFromSSetStoreExtendedData(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SStoreExtendedData o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListGeometryInfo(Collection input) { - List result = new ArrayList(); - for (GeometryInfo o : input) { + public List convertToSListStoreExtendedData(Collection input) { + List result = new ArrayList(); + for (StoreExtendedData o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListGeometryInfo(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SGeometryInfo o : input) { + public List convertFromSListStoreExtendedData(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SStoreExtendedData o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SGeometryInfo convertToSObject(GeometryInfo input) { + public SStoreExtendedData convertToSObject(StoreExtendedData input) { if (input == null) { return null; } - SGeometryInfo result = new SGeometryInfo(); + SStoreExtendedData result = new SStoreExtendedData(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setStartVertex(input.getStartVertex()); - result.setStartIndex(input.getStartIndex()); - result.setPrimitiveCount(input.getPrimitiveCount()); - result.setTransformation(input.getTransformation()); - result.setArea(input.getArea()); - result.setVolume(input.getVolume()); - result.setHasTransparency(input.isHasTransparency()); - result.setIfcProductOid(input.getIfcProductOid()); - result.setDensity(input.getDensity()); - Bounds boundsVal = input.getBounds(); - result.setBounds(convertToSObject(boundsVal)); - Bounds boundsUntransformedVal = input.getBoundsUntransformed(); - result.setBoundsUntransformed(convertToSObject(boundsUntransformedVal)); - GeometryData dataVal = input.getData(); - result.setDataId(dataVal == null ? -1 : dataVal.getOid()); - Bounds boundsMmVal = input.getBoundsMm(); - result.setBoundsMm(convertToSObject(boundsMmVal)); - Bounds boundsUntransformedMmVal = input.getBoundsUntransformedMm(); - result.setBoundsUntransformedMm(convertToSObject(boundsUntransformedMmVal)); return result; } - public GeometryInfo convertFromSObject(SGeometryInfo input, DatabaseSession session) throws BimserverDatabaseException { + public StoreExtendedData convertFromSObject(SStoreExtendedData input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - GeometryInfo result = convertFromSObject(input, GeometryFactory.eINSTANCE.createGeometryInfo(), session); + StoreExtendedData result = convertFromSObject(input, StoreFactory.eINSTANCE.createStoreExtendedData(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -11810,84 +11822,69 @@ public GeometryInfo convertFromSObject(SGeometryInfo input, DatabaseSession sess return result; } - public GeometryInfo convertFromSObject(SGeometryInfo input) throws BimserverDatabaseException { - GeometryInfo result = convertFromSObject(input, GeometryFactory.eINSTANCE.createGeometryInfo(), null); + public StoreExtendedData convertFromSObject(SStoreExtendedData input) throws BimserverDatabaseException { + StoreExtendedData result = convertFromSObject(input, StoreFactory.eINSTANCE.createStoreExtendedData(), null); return result; } - public GeometryInfo convertFromSObject(SGeometryInfo input, GeometryInfo result, DatabaseSession session) throws BimserverDatabaseException { + public StoreExtendedData convertFromSObject(SStoreExtendedData input, StoreExtendedData result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setStartVertex(input.getStartVertex()); - result.setStartIndex(input.getStartIndex()); - result.setPrimitiveCount(input.getPrimitiveCount()); - result.setTransformation(input.getTransformation()); - result.setArea(input.getArea()); - result.setVolume(input.getVolume()); - result.setHasTransparency(input.isHasTransparency()); - result.setIfcProductOid(input.getIfcProductOid()); - result.setDensity(input.getDensity()); - result.setBounds(convertFromSObject(input.getBounds(), session)); - result.setBoundsUntransformed(convertFromSObject(input.getBoundsUntransformed(), session)); - result.setData((GeometryData)session.get(GeometryPackage.eINSTANCE.getGeometryData(), input.getDataId(), OldQuery.getDefault())); - result.setBoundsMm(convertFromSObject(input.getBoundsMm(), session)); - result.setBoundsUntransformedMm(convertFromSObject(input.getBoundsUntransformedMm(), session)); return result; } - public Set convertToSSetVector3f(Collection input) { - Set result = new HashSet(); - for (Vector3f o : input) { + public Set convertToSSetCheckinRevision(Collection input) { + Set result = new HashSet(); + for (CheckinRevision o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetVector3f(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SVector3f o : input) { + public Set convertFromSSetCheckinRevision(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SCheckinRevision o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListVector3f(Collection input) { - List result = new ArrayList(); - for (Vector3f o : input) { + public List convertToSListCheckinRevision(Collection input) { + List result = new ArrayList(); + for (CheckinRevision o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListVector3f(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SVector3f o : input) { + public List convertFromSListCheckinRevision(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SCheckinRevision o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SVector3f convertToSObject(Vector3f input) { + public SCheckinRevision convertToSObject(CheckinRevision input) { if (input == null) { return null; } - SVector3f result = new SVector3f(); + SCheckinRevision result = new SCheckinRevision(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setX(input.getX()); - result.setY(input.getY()); - result.setZ(input.getZ()); + Project projectVal = input.getProject(); + result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); return result; } - public Vector3f convertFromSObject(SVector3f input, DatabaseSession session) throws BimserverDatabaseException { + public CheckinRevision convertFromSObject(SCheckinRevision input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - Vector3f result = convertFromSObject(input, GeometryFactory.eINSTANCE.createVector3f(), session); + CheckinRevision result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckinRevision(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -11895,74 +11892,94 @@ public Vector3f convertFromSObject(SVector3f input, DatabaseSession session) thr return result; } - public Vector3f convertFromSObject(SVector3f input) throws BimserverDatabaseException { - Vector3f result = convertFromSObject(input, GeometryFactory.eINSTANCE.createVector3f(), null); + public CheckinRevision convertFromSObject(SCheckinRevision input) throws BimserverDatabaseException { + CheckinRevision result = convertFromSObject(input, StoreFactory.eINSTANCE.createCheckinRevision(), null); return result; } - public Vector3f convertFromSObject(SVector3f input, Vector3f result, DatabaseSession session) throws BimserverDatabaseException { + public CheckinRevision convertFromSObject(SCheckinRevision input, CheckinRevision result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setX(input.getX()); - result.setY(input.getY()); - result.setZ(input.getZ()); + result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); return result; } + public SServiceStatus convertToSObject(ServiceStatus input) { + return SServiceStatus.values()[input.ordinal()]; + } + + public ServiceStatus convertFromSObject(SServiceStatus input) { + return ServiceStatus.values()[input.ordinal()]; + } - public Set convertToSSetBounds(Collection input) { - Set result = new HashSet(); - for (Bounds o : input) { + public Set convertToSSetNewService(Collection input) { + Set result = new HashSet(); + for (NewService o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetBounds(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SBounds o : input) { + public Set convertFromSSetNewService(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SNewService o : input) { result.add(convertFromSObject(o, session)); } return result; } - - public List convertToSListBounds(Collection input) { - List result = new ArrayList(); - for (Bounds o : input) { + + public List convertToSListNewService(Collection input) { + List result = new ArrayList(); + for (NewService o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListBounds(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SBounds o : input) { + public List convertFromSListNewService(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SNewService o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SBounds convertToSObject(Bounds input) { + public SNewService convertToSObject(NewService input) { if (input == null) { return null; } - SBounds result = new SBounds(); + SNewService result = new SNewService(); result.setOid(input.getOid()); result.setRid(input.getRid()); - Vector3f minVal = input.getMin(); - result.setMin(convertToSObject(minVal)); - Vector3f maxVal = input.getMax(); - result.setMax(convertToSObject(maxVal)); + result.setName(input.getName()); + result.setProvider(input.getProvider()); + result.setDescription(input.getDescription()); + result.setAuthorizationUrl(input.getAuthorizationUrl()); + result.setTokenUrl(input.getTokenUrl()); + result.setResourceUrl(input.getResourceUrl()); + result.setRegisterUrl(input.getRegisterUrl()); + result.setInput(input.getInput()); + result.setOauthCode(input.getOauthCode()); + result.setStatus(SServiceStatus.values()[input.getStatus().ordinal()]); + result.setOutput(input.getOutput()); + result.setAccessToken(input.getAccessToken()); + result.setStateJson(input.getStateJson()); + SerializerPluginConfiguration serializerVal = input.getSerializer(); + result.setSerializerId(serializerVal == null ? -1 : serializerVal.getOid()); + Action actionVal = input.getAction(); + result.setAction(convertToSObject(actionVal)); + Project projectVal = input.getProject(); + result.setProjectId(projectVal == null ? -1 : projectVal.getOid()); return result; } - public Bounds convertFromSObject(SBounds input, DatabaseSession session) throws BimserverDatabaseException { + public NewService convertFromSObject(SNewService input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - Bounds result = convertFromSObject(input, GeometryFactory.eINSTANCE.createBounds(), session); + NewService result = convertFromSObject(input, StoreFactory.eINSTANCE.createNewService(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -11970,70 +11987,85 @@ public Bounds convertFromSObject(SBounds input, DatabaseSession session) throws return result; } - public Bounds convertFromSObject(SBounds input) throws BimserverDatabaseException { - Bounds result = convertFromSObject(input, GeometryFactory.eINSTANCE.createBounds(), null); + public NewService convertFromSObject(SNewService input) throws BimserverDatabaseException { + NewService result = convertFromSObject(input, StoreFactory.eINSTANCE.createNewService(), null); return result; } - public Bounds convertFromSObject(SBounds input, Bounds result, DatabaseSession session) throws BimserverDatabaseException { + public NewService convertFromSObject(SNewService input, NewService result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setMin(convertFromSObject(input.getMin(), session)); - result.setMax(convertFromSObject(input.getMax(), session)); + result.setName(input.getName()); + result.setProvider(input.getProvider()); + result.setDescription(input.getDescription()); + result.setAuthorizationUrl(input.getAuthorizationUrl()); + result.setTokenUrl(input.getTokenUrl()); + result.setResourceUrl(input.getResourceUrl()); + result.setRegisterUrl(input.getRegisterUrl()); + result.setInput(input.getInput()); + result.setOauthCode(input.getOauthCode()); + result.setStatus(ServiceStatus.values()[input.getStatus().ordinal()]); + result.setOutput(input.getOutput()); + result.setAccessToken(input.getAccessToken()); + result.setStateJson(input.getStateJson()); + result.setSerializer((SerializerPluginConfiguration)session.get(StorePackage.eINSTANCE.getSerializerPluginConfiguration(), input.getSerializerId(), OldQuery.getDefault())); + result.setAction(convertFromSObject(input.getAction(), session)); + result.setProject((Project)session.get(StorePackage.eINSTANCE.getProject(), input.getProjectId(), OldQuery.getDefault())); return result; } - public Set convertToSSetBuffer(Collection input) { - Set result = new HashSet(); - for (Buffer o : input) { + public Set convertToSSetRunServiceAuthorization(Collection input) { + Set result = new HashSet(); + for (RunServiceAuthorization o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetBuffer(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SBuffer o : input) { + public Set convertFromSSetRunServiceAuthorization(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SRunServiceAuthorization o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListBuffer(Collection input) { - List result = new ArrayList(); - for (Buffer o : input) { + public List convertToSListRunServiceAuthorization(Collection input) { + List result = new ArrayList(); + for (RunServiceAuthorization o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListBuffer(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SBuffer o : input) { + public List convertFromSListRunServiceAuthorization(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SRunServiceAuthorization o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SBuffer convertToSObject(Buffer input) { + public SRunServiceAuthorization convertToSObject(RunServiceAuthorization input) { if (input == null) { return null; } - SBuffer result = new SBuffer(); + SRunServiceAuthorization result = new SRunServiceAuthorization(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setData(input.getData()); + InternalServicePluginConfiguration serviceVal = input.getService(); + result.setServiceId(serviceVal == null ? -1 : serviceVal.getOid()); return result; } - public Buffer convertFromSObject(SBuffer input, DatabaseSession session) throws BimserverDatabaseException { + public RunServiceAuthorization convertFromSObject(SRunServiceAuthorization input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - Buffer result = convertFromSObject(input, GeometryFactory.eINSTANCE.createBuffer(), session); + RunServiceAuthorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createRunServiceAuthorization(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -12041,94 +12073,73 @@ public Buffer convertFromSObject(SBuffer input, DatabaseSession session) throws return result; } - public Buffer convertFromSObject(SBuffer input) throws BimserverDatabaseException { - Buffer result = convertFromSObject(input, GeometryFactory.eINSTANCE.createBuffer(), null); + public RunServiceAuthorization convertFromSObject(SRunServiceAuthorization input) throws BimserverDatabaseException { + RunServiceAuthorization result = convertFromSObject(input, StoreFactory.eINSTANCE.createRunServiceAuthorization(), null); return result; } - public Buffer convertFromSObject(SBuffer input, Buffer result, DatabaseSession session) throws BimserverDatabaseException { + public RunServiceAuthorization convertFromSObject(SRunServiceAuthorization input, RunServiceAuthorization result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setData(input.getData()); + result.setService((InternalServicePluginConfiguration)session.get(StorePackage.eINSTANCE.getInternalServicePluginConfiguration(), input.getServiceId(), OldQuery.getDefault())); return result; } - public Set convertToSSetGeometryData(Collection input) { - Set result = new HashSet(); - for (GeometryData o : input) { + public Set convertToSSetDensityCollection(Collection input) { + Set result = new HashSet(); + for (DensityCollection o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetGeometryData(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SGeometryData o : input) { + public Set convertFromSSetDensityCollection(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SDensityCollection o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListGeometryData(Collection input) { - List result = new ArrayList(); - for (GeometryData o : input) { + public List convertToSListDensityCollection(Collection input) { + List result = new ArrayList(); + for (DensityCollection o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListGeometryData(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SGeometryData o : input) { + public List convertFromSListDensityCollection(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SDensityCollection o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SGeometryData convertToSObject(GeometryData input) { + public SDensityCollection convertToSObject(DensityCollection input) { if (input == null) { return null; } - SGeometryData result = new SGeometryData(); + SDensityCollection result = new SDensityCollection(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setNrIndices(input.getNrIndices()); - result.setNrVertices(input.getNrVertices()); - result.setNrNormals(input.getNrNormals()); - result.setNrColors(input.getNrColors()); - result.setHasTransparency(input.isHasTransparency()); - result.setReused(input.getReused()); - result.setType(input.getType()); - result.setSaveableTriangles(input.getSaveableTriangles()); - Buffer indicesVal = input.getIndices(); - result.setIndicesId(indicesVal == null ? -1 : indicesVal.getOid()); - Buffer verticesVal = input.getVertices(); - result.setVerticesId(verticesVal == null ? -1 : verticesVal.getOid()); - Buffer verticesQuantizedVal = input.getVerticesQuantized(); - result.setVerticesQuantizedId(verticesQuantizedVal == null ? -1 : verticesQuantizedVal.getOid()); - Buffer normalsVal = input.getNormals(); - result.setNormalsId(normalsVal == null ? -1 : normalsVal.getOid()); - Buffer normalsQuantizedVal = input.getNormalsQuantized(); - result.setNormalsQuantizedId(normalsQuantizedVal == null ? -1 : normalsQuantizedVal.getOid()); - Buffer colorsQuantizedVal = input.getColorsQuantized(); - result.setColorsQuantizedId(colorsQuantizedVal == null ? -1 : colorsQuantizedVal.getOid()); - Vector4f colorVal = input.getColor(); - result.setColor(convertToSObject(colorVal)); - Vector4f mostUsedColorVal = input.getMostUsedColor(); - result.setMostUsedColor(convertToSObject(mostUsedColorVal)); - Bounds boundsMmVal = input.getBoundsMm(); - result.setBoundsMm(convertToSObject(boundsMmVal)); + List listdensities = new ArrayList(); + for (Density v : input.getDensities()) { + listdensities.add(convertToSObject(v)); + } + result.setDensities(listdensities); return result; } - public GeometryData convertFromSObject(SGeometryData input, DatabaseSession session) throws BimserverDatabaseException { + public DensityCollection convertFromSObject(SDensityCollection input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - GeometryData result = convertFromSObject(input, GeometryFactory.eINSTANCE.createGeometryData(), session); + DensityCollection result = convertFromSObject(input, StoreFactory.eINSTANCE.createDensityCollection(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -12136,88 +12147,77 @@ public GeometryData convertFromSObject(SGeometryData input, DatabaseSession sess return result; } - public GeometryData convertFromSObject(SGeometryData input) throws BimserverDatabaseException { - GeometryData result = convertFromSObject(input, GeometryFactory.eINSTANCE.createGeometryData(), null); + public DensityCollection convertFromSObject(SDensityCollection input) throws BimserverDatabaseException { + DensityCollection result = convertFromSObject(input, StoreFactory.eINSTANCE.createDensityCollection(), null); return result; } - public GeometryData convertFromSObject(SGeometryData input, GeometryData result, DatabaseSession session) throws BimserverDatabaseException { + public DensityCollection convertFromSObject(SDensityCollection input, DensityCollection result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setNrIndices(input.getNrIndices()); - result.setNrVertices(input.getNrVertices()); - result.setNrNormals(input.getNrNormals()); - result.setNrColors(input.getNrColors()); - result.setHasTransparency(input.isHasTransparency()); - result.setReused(input.getReused()); - result.setType(input.getType()); - result.setSaveableTriangles(input.getSaveableTriangles()); - result.setIndices((Buffer)session.get(GeometryPackage.eINSTANCE.getBuffer(), input.getIndicesId(), OldQuery.getDefault())); - result.setVertices((Buffer)session.get(GeometryPackage.eINSTANCE.getBuffer(), input.getVerticesId(), OldQuery.getDefault())); - result.setVerticesQuantized((Buffer)session.get(GeometryPackage.eINSTANCE.getBuffer(), input.getVerticesQuantizedId(), OldQuery.getDefault())); - result.setNormals((Buffer)session.get(GeometryPackage.eINSTANCE.getBuffer(), input.getNormalsId(), OldQuery.getDefault())); - result.setNormalsQuantized((Buffer)session.get(GeometryPackage.eINSTANCE.getBuffer(), input.getNormalsQuantizedId(), OldQuery.getDefault())); - result.setColorsQuantized((Buffer)session.get(GeometryPackage.eINSTANCE.getBuffer(), input.getColorsQuantizedId(), OldQuery.getDefault())); - result.setColor(convertFromSObject(input.getColor(), session)); - result.setMostUsedColor(convertFromSObject(input.getMostUsedColor(), session)); - result.setBoundsMm(convertFromSObject(input.getBoundsMm(), session)); + List listdensities = result.getDensities(); + for (SDensity v : input.getDensities()) { + listdensities.add(convertFromSObject(v, session)); + } return result; } - public Set convertToSSetVector4f(Collection input) { - Set result = new HashSet(); - for (Vector4f o : input) { + public Set convertToSSetDensity(Collection input) { + Set result = new HashSet(); + for (Density o : input) { result.add(convertToSObject(o)); } return result; } - public Set convertFromSSetVector4f(Collection input, DatabaseSession session) throws BimserverDatabaseException { - Set result = new HashSet(); - for (SVector4f o : input) { + public Set convertFromSSetDensity(Collection input, DatabaseSession session) throws BimserverDatabaseException { + Set result = new HashSet(); + for (SDensity o : input) { result.add(convertFromSObject(o, session)); } return result; } - public List convertToSListVector4f(Collection input) { - List result = new ArrayList(); - for (Vector4f o : input) { + public List convertToSListDensity(Collection input) { + List result = new ArrayList(); + for (Density o : input) { result.add(convertToSObject(o)); } return result; } - public List convertFromSListVector4f(Collection input, DatabaseSession session) throws BimserverDatabaseException { - List result = new ArrayList(); - for (SVector4f o : input) { + public List convertFromSListDensity(Collection input, DatabaseSession session) throws BimserverDatabaseException { + List result = new ArrayList(); + for (SDensity o : input) { result.add(convertFromSObject(o, session)); } return result; } - public SVector4f convertToSObject(Vector4f input) { + public SDensity convertToSObject(Density input) { if (input == null) { return null; } - SVector4f result = new SVector4f(); + SDensity result = new SDensity(); result.setOid(input.getOid()); result.setRid(input.getRid()); - result.setX(input.getX()); - result.setY(input.getY()); - result.setZ(input.getZ()); - result.setW(input.getW()); + result.setType(input.getType()); + result.setGeometryInfoId(input.getGeometryInfoId()); + result.setTrianglesBelow(input.getTrianglesBelow()); + result.setTrianglesAbove(input.getTrianglesAbove()); + result.setVolume(input.getVolume()); + result.setDensity(input.getDensity()); return result; } - public Vector4f convertFromSObject(SVector4f input, DatabaseSession session) throws BimserverDatabaseException { + public Density convertFromSObject(SDensity input, DatabaseSession session) throws BimserverDatabaseException { if (session == null) { throw new BimserverDatabaseException("session == null, use the other method"); } LOGGER.info("Potential unlinked object created"); - Vector4f result = convertFromSObject(input, GeometryFactory.eINSTANCE.createVector4f(), session); + Density result = convertFromSObject(input, StoreFactory.eINSTANCE.createDensity(), session); ((IdEObjectImpl)result).setOid(input.getOid()); ((IdEObjectImpl)result).setRid(input.getRid()); @@ -12225,19 +12225,21 @@ public Vector4f convertFromSObject(SVector4f input, DatabaseSession session) thr return result; } - public Vector4f convertFromSObject(SVector4f input) throws BimserverDatabaseException { - Vector4f result = convertFromSObject(input, GeometryFactory.eINSTANCE.createVector4f(), null); + public Density convertFromSObject(SDensity input) throws BimserverDatabaseException { + Density result = convertFromSObject(input, StoreFactory.eINSTANCE.createDensity(), null); return result; } - public Vector4f convertFromSObject(SVector4f input, Vector4f result, DatabaseSession session) throws BimserverDatabaseException { + public Density convertFromSObject(SDensity input, Density result, DatabaseSession session) throws BimserverDatabaseException { if (input == null) { return null; } - result.setX(input.getX()); - result.setY(input.getY()); - result.setZ(input.getZ()); - result.setW(input.getW()); + result.setType(input.getType()); + result.setGeometryInfoId(input.getGeometryInfoId()); + result.setTrianglesBelow(input.getTrianglesBelow()); + result.setTrianglesAbove(input.getTrianglesAbove()); + result.setVolume(input.getVolume()); + result.setDensity(input.getDensity()); return result; } } \ No newline at end of file diff --git a/BimServer/models/models.ecore b/BimServer/models/models.ecore index 2f66315f1b..1cf4fc9c15 100644 --- a/BimServer/models/models.ecore +++ b/BimServer/models/models.ecore @@ -20947,6 +20947,7 @@ + diff --git a/BimServer/models/models.genmodel b/BimServer/models/models.genmodel index c93d34a822..bbb51cbc8f 100644 --- a/BimServer/models/models.genmodel +++ b/BimServer/models/models.genmodel @@ -12520,6 +12520,7 @@ + diff --git a/BimServer/src/org/bimserver/BimServer.java b/BimServer/src/org/bimserver/BimServer.java index eacd2e68e9..374e0ffaae 100644 --- a/BimServer/src/org/bimserver/BimServer.java +++ b/BimServer/src/org/bimserver/BimServer.java @@ -59,7 +59,6 @@ import org.bimserver.database.berkeley.BerkeleyKeyValueStore; import org.bimserver.database.berkeley.DatabaseInitException; import org.bimserver.database.migrations.InconsistentModelsException; -import org.bimserver.database.queries.GeometryAccellerator; import org.bimserver.database.queries.om.Include; import org.bimserver.database.queries.om.JsonQueryObjectModelConverter; import org.bimserver.database.query.conditions.AttributeCondition; @@ -70,6 +69,7 @@ import org.bimserver.emf.PackageMetaData; import org.bimserver.emf.Schema; import org.bimserver.endpoints.EndPointManager; +import org.bimserver.geometry.accellerator.GeometryAccellerator; import org.bimserver.interfaces.SConverter; import org.bimserver.interfaces.objects.SInternalServicePluginConfiguration; import org.bimserver.interfaces.objects.SPluginBundleVersion; diff --git a/BimServer/src/org/bimserver/database/Database.java b/BimServer/src/org/bimserver/database/Database.java index daed6a3ea8..38d06ee18a 100644 --- a/BimServer/src/org/bimserver/database/Database.java +++ b/BimServer/src/org/bimserver/database/Database.java @@ -92,7 +92,7 @@ public class Database implements BimDatabase { * database-schema change. Do not change this variable when nothing has * changed in the schema! */ - public static final int APPLICATION_SCHEMA_VERSION = 42; + public static final int APPLICATION_SCHEMA_VERSION = 43; public Database(BimServer bimServer, Set emfPackages, KeyValueStore keyValueStore, MetaDataManager metaDataManager) throws DatabaseInitException { this.cidToEclass = new EClass[Short.MAX_VALUE]; diff --git a/BimServer/src/org/bimserver/database/migrations/steps/Step0043.java b/BimServer/src/org/bimserver/database/migrations/steps/Step0043.java new file mode 100644 index 0000000000..941be7134a --- /dev/null +++ b/BimServer/src/org/bimserver/database/migrations/steps/Step0043.java @@ -0,0 +1,38 @@ +package org.bimserver.database.migrations.steps; + +/****************************************************************************** + * Copyright (C) 2009-2018 BIMserver.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see {@literal}. + *****************************************************************************/ + +import org.bimserver.database.DatabaseSession; +import org.bimserver.database.migrations.Migration; +import org.bimserver.database.migrations.Schema; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EcorePackage; + +public class Step0043 extends Migration { + + @Override + public void migrate(Schema schema, DatabaseSession databaseSession) { + EClass oauthCode = schema.getEClass("store", "OAuthAuthorizationCode"); + schema.createEAttribute(oauthCode, "issued", EcorePackage.eINSTANCE.getEDate()); + } + + @Override + public String getDescription() { + return "Added issued date"; + } +} \ No newline at end of file diff --git a/BimServer/src/org/bimserver/database/queries/QueryPartStackFrame.java b/BimServer/src/org/bimserver/database/queries/QueryPartStackFrame.java index e53dbddef2..d4247aa163 100644 --- a/BimServer/src/org/bimserver/database/queries/QueryPartStackFrame.java +++ b/BimServer/src/org/bimserver/database/queries/QueryPartStackFrame.java @@ -30,6 +30,8 @@ import org.bimserver.database.queries.om.InBoundingBox; import org.bimserver.database.queries.om.Include; import org.bimserver.database.queries.om.Include.TypeDef; +import org.bimserver.geometry.accellerator.GeometryObject; +import org.bimserver.geometry.accellerator.Node; import org.bimserver.database.queries.om.Properties; import org.bimserver.database.queries.om.QueryException; import org.bimserver.database.queries.om.QueryPart; diff --git a/BimServer/src/org/bimserver/database/queries/StartFrame.java b/BimServer/src/org/bimserver/database/queries/StartFrame.java index 61d19a530c..5ad9aee068 100644 --- a/BimServer/src/org/bimserver/database/queries/StartFrame.java +++ b/BimServer/src/org/bimserver/database/queries/StartFrame.java @@ -24,6 +24,9 @@ import org.bimserver.BimserverDatabaseException; import org.bimserver.database.queries.om.Include.TypeDef; +import org.bimserver.geometry.accellerator.GeometryObject; +import org.bimserver.geometry.accellerator.Node; +import org.bimserver.geometry.accellerator.Octree; import org.bimserver.database.queries.om.QueryException; import org.bimserver.database.queries.om.QueryPart; import org.bimserver.database.queries.om.Tiles; diff --git a/BimServer/src/org/bimserver/database/queries/DensityThreshold.java b/BimServer/src/org/bimserver/geometry/accellerator/DensityThreshold.java similarity index 79% rename from BimServer/src/org/bimserver/database/queries/DensityThreshold.java rename to BimServer/src/org/bimserver/geometry/accellerator/DensityThreshold.java index 2967b145bf..caef602637 100644 --- a/BimServer/src/org/bimserver/database/queries/DensityThreshold.java +++ b/BimServer/src/org/bimserver/geometry/accellerator/DensityThreshold.java @@ -1,4 +1,4 @@ -package org.bimserver.database.queries; +package org.bimserver.geometry.accellerator; import org.bimserver.interfaces.objects.SDensity; diff --git a/BimServer/src/org/bimserver/database/queries/DensityThresholdKey.java b/BimServer/src/org/bimserver/geometry/accellerator/DensityThresholdKey.java similarity index 93% rename from BimServer/src/org/bimserver/database/queries/DensityThresholdKey.java rename to BimServer/src/org/bimserver/geometry/accellerator/DensityThresholdKey.java index 5e8292ae8f..ccff17d399 100644 --- a/BimServer/src/org/bimserver/database/queries/DensityThresholdKey.java +++ b/BimServer/src/org/bimserver/geometry/accellerator/DensityThresholdKey.java @@ -1,4 +1,4 @@ -package org.bimserver.database.queries; +package org.bimserver.geometry.accellerator; import java.util.Set; diff --git a/BimServer/src/org/bimserver/database/queries/GeometryAccellerator.java b/BimServer/src/org/bimserver/geometry/accellerator/GeometryAccellerator.java similarity index 82% rename from BimServer/src/org/bimserver/database/queries/GeometryAccellerator.java rename to BimServer/src/org/bimserver/geometry/accellerator/GeometryAccellerator.java index c300dcfbb1..382cec11cb 100644 --- a/BimServer/src/org/bimserver/database/queries/GeometryAccellerator.java +++ b/BimServer/src/org/bimserver/geometry/accellerator/GeometryAccellerator.java @@ -1,6 +1,7 @@ -package org.bimserver.database.queries; +package org.bimserver.geometry.accellerator; import java.io.IOException; +import java.nio.file.Path; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -11,6 +12,7 @@ import org.bimserver.BimserverDatabaseException; import org.bimserver.database.DatabaseSession; import org.bimserver.database.OldQuery; +import org.bimserver.database.queries.QueryObjectProvider; import org.bimserver.database.queries.om.Include; import org.bimserver.database.queries.om.Query; import org.bimserver.database.queries.om.QueryException; @@ -24,19 +26,25 @@ import org.bimserver.shared.HashMapVirtualObject; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; public class GeometryAccellerator { - private BimServer bimServer; - private LoadingCache> octrees; - private LoadingCache densityThresholds; - private LoadingCache reuseSets; + private static final Logger LOGGER = LoggerFactory.getLogger(GeometryAccellerator.class); + private final BimServer bimServer; + private final LoadingCache> octrees; + private final LoadingCache densityThresholds; + private final LoadingCache reuseSets; + private Path geometryCacheFolder; public GeometryAccellerator(BimServer bimServer) { this.bimServer = bimServer; + + geometryCacheFolder = this.bimServer.getHomeDir().resolve("geometrycache"); octrees = CacheBuilder.newBuilder().maximumSize(10000).build(new CacheLoader>() { public Octree load(OctreeKey key) { @@ -60,17 +68,15 @@ public DensityThreshold load(DensityThresholdKey key) throws Exception { public Octree getOctree(Set roids, Set excludedClasses, Set geometryIdsToReuse, int maxDepth, float minimumThreshold, float maximumThreshold) { OctreeKey key = new OctreeKey(roids, excludedClasses, geometryIdsToReuse, maxDepth, minimumThreshold, maximumThreshold); -// return generateOctree(key); try { return octrees.get(key); } catch (ExecutionException e) { - e.printStackTrace(); + LOGGER.error("", e); return null; } } private Octree generateOctree(OctreeKey key) { - long start = System.nanoTime(); try (DatabaseSession databaseSession = bimServer.getDatabase().createSession()) { org.bimserver.database.queries.Bounds totalBounds = new org.bimserver.database.queries.Bounds(); @@ -160,16 +166,13 @@ public void traverse(Node t) { } }); - long end = System.nanoTime(); -// System.out.println("generateOctree " + ((end - start) / 1000000) + " ms"); -// System.out.println(key.toString()); return octree; } catch (BimserverDatabaseException e) { - e.printStackTrace(); + LOGGER.error("", e); } catch (IOException e) { - e.printStackTrace(); + LOGGER.error("", e); } catch (QueryException e) { - e.printStackTrace(); + LOGGER.error("", e); } return null; } @@ -212,30 +215,25 @@ private DensityThreshold generateDensityThreshold(DensityThresholdKey key) { densityResult.setTrianglesAbove(cumulativeTrianglesAbove); densityThreshold.setDensity(bimServer.getSConverter().convertToSObject(densityResult)); } catch (BimserverDatabaseException e) { - e.printStackTrace(); + LOGGER.error("", e); } return densityThreshold; } public Set getGeometryDataToReuse(Set roids, Set excludedTypes, Integer trianglesToSave) { ReuseKey key = new ReuseKey(roids, excludedTypes); -// return generateReuseSet(key).getListOfGeometryDataIds(trianglesToSave); try { return reuseSets.get(key).getListOfGeometryDataIds(trianglesToSave); } catch (ExecutionException e) { - e.printStackTrace(); + LOGGER.error("", e); return null; } } private ReuseSet generateReuseSet(ReuseKey key) { - long start = System.nanoTime(); ReuseSet reuseSet = new ReuseSet(); try (DatabaseSession databaseSession = bimServer.getDatabase().createSession()) { - // Assuming all given roids are of projects that all have the same - // schema - -// Map geometryDataMap = listGeometryData(databaseSession, key.getRoids()); + // Assuming all given roids are of projects that all have the same schema Revision revision = databaseSession.get(key.getRoids().iterator().next(), OldQuery.getDefault()); PackageMetaData packageMetaData = bimServer.getMetaDataManager().getPackageMetaData(revision.getProject().getSchema()); @@ -278,44 +276,21 @@ private ReuseSet generateReuseSet(ReuseKey key) { reuseSet.add(map.get(dataId)); } } catch (BimserverDatabaseException e) { - e.printStackTrace(); + LOGGER.error("", e); } catch (QueryException e) { - e.printStackTrace(); + LOGGER.error("", e); } catch (IOException e) { - e.printStackTrace(); + LOGGER.error("", e); } - long end = System.nanoTime(); -// System.out.println("generateReuseSet: " + ((end - start) / 1000000) + " ms"); return reuseSet; } - private Map listGeometryData(DatabaseSession databaseSession, Set roids) throws BimserverDatabaseException, IOException, QueryException { - Map map = new HashMap<>(); - - Revision revision = databaseSession.get(roids.iterator().next(), OldQuery.getDefault()); - PackageMetaData packageMetaData = bimServer.getMetaDataManager().getPackageMetaData(revision.getProject().getSchema()); - - Query query = new Query(packageMetaData); - - QueryPart queryPart = query.createQueryPart(); - queryPart.addType(GeometryPackage.eINSTANCE.getGeometryData(), false); - - QueryObjectProvider queryObjectProvider = new QueryObjectProvider(databaseSession, bimServer, query, roids, packageMetaData); - HashMapVirtualObject next = queryObjectProvider.next(); - while (next != null) { - map.put(next.getOid(), next); - next = queryObjectProvider.next(); - } - return map; - } - public SDensity getDensityThreshold(Long roid, Long nrTriangles, Set excludedTypes) { DensityThresholdKey key = new DensityThresholdKey(roid, nrTriangles, excludedTypes); -// return generateDensityThreshold(key).getDensity(); try { return densityThresholds.get(key).getDensity(); } catch (ExecutionException e) { - e.printStackTrace(); + LOGGER.error("", e); return null; } } diff --git a/BimServer/src/org/bimserver/database/queries/GeometryObject.java b/BimServer/src/org/bimserver/geometry/accellerator/GeometryObject.java similarity index 91% rename from BimServer/src/org/bimserver/database/queries/GeometryObject.java rename to BimServer/src/org/bimserver/geometry/accellerator/GeometryObject.java index df799edfb1..bb33a5b3aa 100644 --- a/BimServer/src/org/bimserver/database/queries/GeometryObject.java +++ b/BimServer/src/org/bimserver/geometry/accellerator/GeometryObject.java @@ -1,4 +1,4 @@ -package org.bimserver.database.queries; +package org.bimserver.geometry.accellerator; public class GeometryObject implements Comparable { diff --git a/BimServer/src/org/bimserver/database/queries/Node.java b/BimServer/src/org/bimserver/geometry/accellerator/Node.java similarity index 91% rename from BimServer/src/org/bimserver/database/queries/Node.java rename to BimServer/src/org/bimserver/geometry/accellerator/Node.java index 6db390edd7..70fb359f8e 100644 --- a/BimServer/src/org/bimserver/database/queries/Node.java +++ b/BimServer/src/org/bimserver/geometry/accellerator/Node.java @@ -1,10 +1,13 @@ -package org.bimserver.database.queries; +package org.bimserver.geometry.accellerator; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; +import org.bimserver.database.queries.Bounds; +import org.bimserver.database.queries.ObjectWrapper; + public class Node> { private final Node[] nodes = new Node[8]; private Bounds bounds; diff --git a/BimServer/src/org/bimserver/database/queries/Octree.java b/BimServer/src/org/bimserver/geometry/accellerator/Octree.java similarity index 86% rename from BimServer/src/org/bimserver/database/queries/Octree.java rename to BimServer/src/org/bimserver/geometry/accellerator/Octree.java index 670ca8f09f..fc7ee5cb7d 100644 --- a/BimServer/src/org/bimserver/database/queries/Octree.java +++ b/BimServer/src/org/bimserver/geometry/accellerator/Octree.java @@ -1,10 +1,12 @@ -package org.bimserver.database.queries; +package org.bimserver.geometry.accellerator; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.bimserver.database.queries.Bounds; + public class Octree> extends Node { private final Map> list = new HashMap<>(); diff --git a/BimServer/src/org/bimserver/database/queries/OctreeKey.java b/BimServer/src/org/bimserver/geometry/accellerator/OctreeKey.java similarity index 95% rename from BimServer/src/org/bimserver/database/queries/OctreeKey.java rename to BimServer/src/org/bimserver/geometry/accellerator/OctreeKey.java index b1352f9ac4..71a3c5249e 100644 --- a/BimServer/src/org/bimserver/database/queries/OctreeKey.java +++ b/BimServer/src/org/bimserver/geometry/accellerator/OctreeKey.java @@ -1,4 +1,4 @@ -package org.bimserver.database.queries; +package org.bimserver.geometry.accellerator; import java.util.Set; diff --git a/BimServer/src/org/bimserver/database/queries/ReuseKey.java b/BimServer/src/org/bimserver/geometry/accellerator/ReuseKey.java similarity index 92% rename from BimServer/src/org/bimserver/database/queries/ReuseKey.java rename to BimServer/src/org/bimserver/geometry/accellerator/ReuseKey.java index 9394d32378..15e23988ff 100644 --- a/BimServer/src/org/bimserver/database/queries/ReuseKey.java +++ b/BimServer/src/org/bimserver/geometry/accellerator/ReuseKey.java @@ -1,4 +1,4 @@ -package org.bimserver.database.queries; +package org.bimserver.geometry.accellerator; import java.util.Set; diff --git a/BimServer/src/org/bimserver/database/queries/ReuseObject.java b/BimServer/src/org/bimserver/geometry/accellerator/ReuseObject.java similarity index 91% rename from BimServer/src/org/bimserver/database/queries/ReuseObject.java rename to BimServer/src/org/bimserver/geometry/accellerator/ReuseObject.java index fbd643bad8..88eb619937 100644 --- a/BimServer/src/org/bimserver/database/queries/ReuseObject.java +++ b/BimServer/src/org/bimserver/geometry/accellerator/ReuseObject.java @@ -1,4 +1,4 @@ -package org.bimserver.database.queries; +package org.bimserver.geometry.accellerator; public class ReuseObject { private long geometryDataOid; diff --git a/BimServer/src/org/bimserver/database/queries/ReuseSet.java b/BimServer/src/org/bimserver/geometry/accellerator/ReuseSet.java similarity index 93% rename from BimServer/src/org/bimserver/database/queries/ReuseSet.java rename to BimServer/src/org/bimserver/geometry/accellerator/ReuseSet.java index f51c55c72a..06cca048e8 100644 --- a/BimServer/src/org/bimserver/database/queries/ReuseSet.java +++ b/BimServer/src/org/bimserver/geometry/accellerator/ReuseSet.java @@ -1,4 +1,4 @@ -package org.bimserver.database.queries; +package org.bimserver.geometry.accellerator; import java.util.Comparator; import java.util.HashSet; diff --git a/BimServer/src/org/bimserver/database/queries/Traverser.java b/BimServer/src/org/bimserver/geometry/accellerator/Traverser.java similarity index 62% rename from BimServer/src/org/bimserver/database/queries/Traverser.java rename to BimServer/src/org/bimserver/geometry/accellerator/Traverser.java index 14d4b87623..f87ad55257 100644 --- a/BimServer/src/org/bimserver/database/queries/Traverser.java +++ b/BimServer/src/org/bimserver/geometry/accellerator/Traverser.java @@ -1,4 +1,4 @@ -package org.bimserver.database.queries; +package org.bimserver.geometry.accellerator; public interface Traverser> { void traverse(Node t); diff --git a/BimServer/src/org/bimserver/servlets/BimBotsWebSocket.java b/BimServer/src/org/bimserver/servlets/BimBotsWebSocket.java new file mode 100644 index 0000000000..0d49ba5437 --- /dev/null +++ b/BimServer/src/org/bimserver/servlets/BimBotsWebSocket.java @@ -0,0 +1,5 @@ +package org.bimserver.servlets; + +public class BimBotsWebSocket { + +} diff --git a/BimServer/src/org/bimserver/servlets/Streamer.java b/BimServer/src/org/bimserver/servlets/Streamer.java index 0da7d52295..88fb92e9ff 100644 --- a/BimServer/src/org/bimserver/servlets/Streamer.java +++ b/BimServer/src/org/bimserver/servlets/Streamer.java @@ -39,7 +39,6 @@ import org.bimserver.shared.exceptions.UserException; import org.bimserver.shared.interfaces.NotificationInterface; import org.bimserver.shared.interfaces.RemoteServiceInterface; -import org.bimserver.utils.Formatters; import org.bimserver.utils.GrowingByteBuffer; import org.bimserver.webservices.InvalidTokenException; import org.bimserver.webservices.ServiceMap; diff --git a/BimServer/src/org/bimserver/webservices/impl/OAuthServiceImpl.java b/BimServer/src/org/bimserver/webservices/impl/OAuthServiceImpl.java index c9f141f0c2..e8dcd8af5a 100644 --- a/BimServer/src/org/bimserver/webservices/impl/OAuthServiceImpl.java +++ b/BimServer/src/org/bimserver/webservices/impl/OAuthServiceImpl.java @@ -194,8 +194,9 @@ public List listRegisteredServersLocal() throws ServerException, U @Override public void setAuthorizationCode(Long applicationId, String code) throws UserException, ServerException { try (DatabaseSession session = getBimServer().getDatabase().createSession()) { - OAuthAuthorizationCode oAuthAuthorizationCode = session.create(OAuthAuthorizationCode.class); - OAuthServer server = session.get(applicationId, OldQuery.getDefault()); + OAuthAuthorizationCode oAuthAuthorizationCode = session.create(OAuthAuthorizationCode.class); + OAuthServer server = session.get(applicationId, OldQuery.getDefault()); + oAuthAuthorizationCode.setIssued(new Date()); oAuthAuthorizationCode.setOauthServer(server); oAuthAuthorizationCode.setCode(code); User user = session.get(StorePackage.eINSTANCE.getUser(), getAuthorization().getUoid(), OldQuery.getDefault()); @@ -277,6 +278,7 @@ public String authorize(Long oAuthServerOid, SAuthorization authorization) throw singleProjectAuthorization.setProject(project); OAuthAuthorizationCode code = session.create(OAuthAuthorizationCode.class); + code.setIssued(new Date()); org.bimserver.webservices.authorization.Authorization auth = new org.bimserver.webservices.authorization.SingleProjectAuthorization(getBimServer(), user.getOid(), project.getOid()); @@ -308,6 +310,7 @@ public String authorize(Long oAuthServerOid, SAuthorization authorization) throw runServiceAuth.setService(conf); OAuthAuthorizationCode code = session.create(OAuthAuthorizationCode.class); + code.setIssued(new Date()); org.bimserver.webservices.authorization.Authorization auth = new org.bimserver.webservices.authorization.RunServiceAuthorization(getBimServer(), user.getOid(), conf.getOid()); diff --git a/BimServer/src/org/bimserver/webservices/impl/ServiceImpl.java b/BimServer/src/org/bimserver/webservices/impl/ServiceImpl.java index 1f80530f27..655627292d 100644 --- a/BimServer/src/org/bimserver/webservices/impl/ServiceImpl.java +++ b/BimServer/src/org/bimserver/webservices/impl/ServiceImpl.java @@ -152,10 +152,6 @@ import org.bimserver.database.actions.UserHasCheckinRightsDatabaseAction; import org.bimserver.database.actions.UserHasRightsDatabaseAction; import org.bimserver.database.actions.ValidateModelCheckerDatabaseAction; -import org.bimserver.database.queries.GeometryObject; -import org.bimserver.database.queries.Node; -import org.bimserver.database.queries.Octree; -import org.bimserver.database.queries.Traverser; import org.bimserver.database.queries.om.DefaultQueries; import org.bimserver.database.queries.om.JsonQueryObjectModelConverter; import org.bimserver.database.queries.om.Query; @@ -166,6 +162,10 @@ import org.bimserver.emf.IfcModelInterface; import org.bimserver.emf.PackageMetaData; import org.bimserver.emf.Schema; +import org.bimserver.geometry.accellerator.GeometryObject; +import org.bimserver.geometry.accellerator.Node; +import org.bimserver.geometry.accellerator.Octree; +import org.bimserver.geometry.accellerator.Traverser; import org.bimserver.interfaces.objects.SAccessMethod; import org.bimserver.interfaces.objects.SAction; import org.bimserver.interfaces.objects.SBounds; diff --git a/BimServerClientLib/src/org/bimserver/client/protocolbuffers/ServiceInterface.desc b/BimServerClientLib/src/org/bimserver/client/protocolbuffers/ServiceInterface.desc index 1d13bf88bc..4ab836de23 100644 --- a/BimServerClientLib/src/org/bimserver/client/protocolbuffers/ServiceInterface.desc +++ b/BimServerClientLib/src/org/bimserver/client/protocolbuffers/ServiceInterface.desc @@ -1,5 +1,5 @@ -ä§ +Ö§ ServiceInterface.protoorg.bimserver.pb"$ VoidResponse errorMessage ( " @@ -426,7 +426,7 @@ dataObject ( 2.org.bimserver.pb.SDataObject max ( 2.org.bimserver.pb.SVector3f( min ( 2.org.bimserver.pb.SVector3f oid ( -rid ("ë +rid ("Ý SRevision bmi () bounds ( 2.org.bimserver.pb.SBounds+ @@ -454,8 +454,7 @@ dataObject ( 2.org.bimserver.pb.SDataObject servicesLinked ( size ( tag (  -userId ( -uuid ( "Ñ +userId ("Ñ SCheckout active (, checkin ( 2.org.bimserver.pb.SRevision diff --git a/BimServerClientLib/src/org/bimserver/client/protocolbuffers/ServiceInterface.proto b/BimServerClientLib/src/org/bimserver/client/protocolbuffers/ServiceInterface.proto index 2e7dcf23d5..e0bdfb7e05 100644 --- a/BimServerClientLib/src/org/bimserver/client/protocolbuffers/ServiceInterface.proto +++ b/BimServerClientLib/src/org/bimserver/client/protocolbuffers/ServiceInterface.proto @@ -970,7 +970,6 @@ message SRevision { optional int64 size = 23; optional string tag = 24; optional int64 userId = 25; - optional string uuid = 26; } message SCheckout { diff --git a/BimServerWar/.settings/org.eclipse.wst.common.component b/BimServerWar/.settings/org.eclipse.wst.common.component index de6acd33d2..5a66d8130d 100644 --- a/BimServerWar/.settings/org.eclipse.wst.common.component +++ b/BimServerWar/.settings/org.eclipse.wst.common.component @@ -1,5 +1,5 @@ - + diff --git a/PluginBase/generated/org/bimserver/interfaces/objects/SOAuthAuthorizationCode.java b/PluginBase/generated/org/bimserver/interfaces/objects/SOAuthAuthorizationCode.java index c8dbaea996..710553b43c 100644 --- a/PluginBase/generated/org/bimserver/interfaces/objects/SOAuthAuthorizationCode.java +++ b/PluginBase/generated/org/bimserver/interfaces/objects/SOAuthAuthorizationCode.java @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see {@literal}. *****************************************************************************/ +import java.util.Date; import javax.xml.bind.annotation.XmlTransient; import org.bimserver.shared.meta.*; import javax.xml.bind.annotation.XmlRootElement; @@ -33,6 +34,7 @@ public class SOAuthAuthorizationCode implements SDataBase private java.lang.String code; private long authorizationId = -1; private long userId = -1; + private java.util.Date issued; public long getOid() { return this.oid; @@ -72,6 +74,9 @@ public Object sGet(SField sField) { if (sField.getName().equals("userId")) { return getUserId(); } + if (sField.getName().equals("issued")) { + return getIssued(); + } if (sField.getName().equals("oid")) { return getOid(); } @@ -98,6 +103,10 @@ public void sSet(SField sField, Object val) { setUserId((Long)val); return; } + if (sField.getName().equals("issued")) { + setIssued((Date)val); + return; + } if (sField.getName().equals("oid")) { setOid((Long)val); return; @@ -141,6 +150,14 @@ public void setUserId(long userId) { this.userId = userId; } + public java.util.Date getIssued() { + return issued; + } + + public void setIssued(java.util.Date issued) { + this.issued = issued; + } + @Override public int hashCode() { final int prime = 31; diff --git a/PluginBase/generated/org/bimserver/models/store/OAuthAuthorizationCode.java b/PluginBase/generated/org/bimserver/models/store/OAuthAuthorizationCode.java index 7242edbdfc..7a723aa5c5 100644 --- a/PluginBase/generated/org/bimserver/models/store/OAuthAuthorizationCode.java +++ b/PluginBase/generated/org/bimserver/models/store/OAuthAuthorizationCode.java @@ -33,6 +33,7 @@ * along with this program. If not, see {@literal}. *****************************************************************************/ +import java.util.Date; import org.bimserver.emf.IdEObject; /** @@ -48,6 +49,7 @@ *
  • {@link org.bimserver.models.store.OAuthAuthorizationCode#getCode Code}
    • *
  • {@link org.bimserver.models.store.OAuthAuthorizationCode#getAuthorization Authorization}
    • *
  • {@link org.bimserver.models.store.OAuthAuthorizationCode#getUser User}
    • + *
  • {@link org.bimserver.models.store.OAuthAuthorizationCode#getIssued Issued}
    • * * * @see org.bimserver.models.store.StorePackage#getOAuthAuthorizationCode() @@ -162,4 +164,30 @@ public interface OAuthAuthorizationCode extends IdEObject { */ void setUser(User value); + /** + * Returns the value of the 'Issued' attribute. + * + *

    + * If the meaning of the 'Issued' attribute isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Issued' attribute. + * @see #setIssued(Date) + * @see org.bimserver.models.store.StorePackage#getOAuthAuthorizationCode_Issued() + * @model + * @generated + */ + Date getIssued(); + + /** + * Sets the value of the '{@link org.bimserver.models.store.OAuthAuthorizationCode#getIssued Issued}' attribute. + * + * + * @param value the new value of the 'Issued' attribute. + * @see #getIssued() + * @generated + */ + void setIssued(Date value); + } // OAuthAuthorizationCode diff --git a/PluginBase/generated/org/bimserver/models/store/StorePackage.java b/PluginBase/generated/org/bimserver/models/store/StorePackage.java index 5e593dd6a1..83e0cc6412 100644 --- a/PluginBase/generated/org/bimserver/models/store/StorePackage.java +++ b/PluginBase/generated/org/bimserver/models/store/StorePackage.java @@ -6779,6 +6779,15 @@ public interface StorePackage extends EPackage { */ int OAUTH_AUTHORIZATION_CODE__USER = 3; + /** + * The feature id for the 'Issued' attribute. + * + * + * @generated + * @ordered + */ + int OAUTH_AUTHORIZATION_CODE__ISSUED = 4; + /** * The number of structural features of the 'OAuth Authorization Code' class. * @@ -6786,7 +6795,7 @@ public interface StorePackage extends EPackage { * @generated * @ordered */ - int OAUTH_AUTHORIZATION_CODE_FEATURE_COUNT = 4; + int OAUTH_AUTHORIZATION_CODE_FEATURE_COUNT = 5; /** * The meta object id for the '{@link org.bimserver.models.store.impl.AuthorizationImpl Authorization}' class. @@ -13742,6 +13751,17 @@ public interface StorePackage extends EPackage { */ EReference getOAuthAuthorizationCode_User(); + /** + * Returns the meta object for the attribute '{@link org.bimserver.models.store.OAuthAuthorizationCode#getIssued Issued}'. + * + * + * @return the meta object for the attribute 'Issued'. + * @see org.bimserver.models.store.OAuthAuthorizationCode#getIssued() + * @see #getOAuthAuthorizationCode() + * @generated + */ + EAttribute getOAuthAuthorizationCode_Issued(); + /** * Returns the meta object for class '{@link org.bimserver.models.store.Authorization Authorization}'. * @@ -19248,6 +19268,14 @@ interface Literals { */ EReference OAUTH_AUTHORIZATION_CODE__USER = eINSTANCE.getOAuthAuthorizationCode_User(); + /** + * The meta object literal for the 'Issued' attribute feature. + * + * + * @generated + */ + EAttribute OAUTH_AUTHORIZATION_CODE__ISSUED = eINSTANCE.getOAuthAuthorizationCode_Issued(); + /** * The meta object literal for the '{@link org.bimserver.models.store.impl.AuthorizationImpl Authorization}' class. * diff --git a/PluginBase/generated/org/bimserver/models/store/impl/OAuthAuthorizationCodeImpl.java b/PluginBase/generated/org/bimserver/models/store/impl/OAuthAuthorizationCodeImpl.java index 5cf24aadd0..822565785f 100644 --- a/PluginBase/generated/org/bimserver/models/store/impl/OAuthAuthorizationCodeImpl.java +++ b/PluginBase/generated/org/bimserver/models/store/impl/OAuthAuthorizationCodeImpl.java @@ -33,6 +33,7 @@ * along with this program. If not, see {@literal}. *****************************************************************************/ +import java.util.Date; import org.bimserver.emf.IdEObjectImpl; import org.bimserver.models.store.Authorization; import org.bimserver.models.store.OAuthAuthorizationCode; @@ -53,6 +54,7 @@ *
  • {@link org.bimserver.models.store.impl.OAuthAuthorizationCodeImpl#getCode Code}
    • *
  • {@link org.bimserver.models.store.impl.OAuthAuthorizationCodeImpl#getAuthorization Authorization}
    • *
  • {@link org.bimserver.models.store.impl.OAuthAuthorizationCodeImpl#getUser User}
    • + *
  • {@link org.bimserver.models.store.impl.OAuthAuthorizationCodeImpl#getIssued Issued}
    • * * * @generated @@ -159,4 +161,22 @@ public void setUser(User newUser) { eSet(StorePackage.Literals.OAUTH_AUTHORIZATION_CODE__USER, newUser); } + /** + * + * + * @generated + */ + public Date getIssued() { + return (Date) eGet(StorePackage.Literals.OAUTH_AUTHORIZATION_CODE__ISSUED, true); + } + + /** + * + * + * @generated + */ + public void setIssued(Date newIssued) { + eSet(StorePackage.Literals.OAUTH_AUTHORIZATION_CODE__ISSUED, newIssued); + } + } //OAuthAuthorizationCodeImpl diff --git a/PluginBase/generated/org/bimserver/models/store/impl/StorePackageImpl.java b/PluginBase/generated/org/bimserver/models/store/impl/StorePackageImpl.java index 00e3e7d48a..dcf6d91b45 100644 --- a/PluginBase/generated/org/bimserver/models/store/impl/StorePackageImpl.java +++ b/PluginBase/generated/org/bimserver/models/store/impl/StorePackageImpl.java @@ -6471,6 +6471,15 @@ public EReference getOAuthAuthorizationCode_User() { return (EReference) getOAuthAuthorizationCode().getEStructuralFeatures().get(3); } + /** + * + * + * @generated + */ + public EAttribute getOAuthAuthorizationCode_Issued() { + return (EAttribute) getOAuthAuthorizationCode().getEStructuralFeatures().get(4); + } + /** * * diff --git a/PluginBase/generated/org/bimserver/models/store/impl/store.ecore b/PluginBase/generated/org/bimserver/models/store/impl/store.ecore index 5ee1b79e75..81a5dd986d 100644 --- a/PluginBase/generated/org/bimserver/models/store/impl/store.ecore +++ b/PluginBase/generated/org/bimserver/models/store/impl/store.ecore @@ -1010,6 +1010,7 @@     + diff --git a/PluginBase/generated/org/bimserver/shared/meta/SPackage.java b/PluginBase/generated/org/bimserver/shared/meta/SPackage.java index 8d43709603..902a4ba784 100644 --- a/PluginBase/generated/org/bimserver/shared/meta/SPackage.java +++ b/PluginBase/generated/org/bimserver/shared/meta/SPackage.java @@ -35,6 +35,44 @@ public class SPackage { private void init() { try { + Class.forName("org.bimserver.interfaces.objects.SAccessMethod"); + Class.forName("org.bimserver.interfaces.objects.SLogAction"); + Class.forName("org.bimserver.interfaces.objects.SServerLog"); + Class.forName("org.bimserver.interfaces.objects.SProjectRelated"); + Class.forName("org.bimserver.interfaces.objects.SCheckoutRelated"); + Class.forName("org.bimserver.interfaces.objects.SRevisionRelated"); + Class.forName("org.bimserver.interfaces.objects.SUserRelated"); + Class.forName("org.bimserver.interfaces.objects.SNewUserAdded"); + Class.forName("org.bimserver.interfaces.objects.SNewProjectAdded"); + Class.forName("org.bimserver.interfaces.objects.SRevisionBranched"); + Class.forName("org.bimserver.interfaces.objects.SNewRevisionAdded"); + Class.forName("org.bimserver.interfaces.objects.SNewCheckoutAdded"); + Class.forName("org.bimserver.interfaces.objects.SSettingsSaved"); + Class.forName("org.bimserver.interfaces.objects.SUserAddedToProject"); + Class.forName("org.bimserver.interfaces.objects.SNewObjectIDMUploaded"); + Class.forName("org.bimserver.interfaces.objects.SDownload"); + Class.forName("org.bimserver.interfaces.objects.SUserRemovedFromProject"); + Class.forName("org.bimserver.interfaces.objects.SProjectDeleted"); + Class.forName("org.bimserver.interfaces.objects.SUserDeleted"); + Class.forName("org.bimserver.interfaces.objects.SPasswordReset"); + Class.forName("org.bimserver.interfaces.objects.SDatabaseCreated"); + Class.forName("org.bimserver.interfaces.objects.SServerStarted"); + Class.forName("org.bimserver.interfaces.objects.SProjectUpdated"); + Class.forName("org.bimserver.interfaces.objects.SUserUndeleted"); + Class.forName("org.bimserver.interfaces.objects.SProjectUndeleted"); + Class.forName("org.bimserver.interfaces.objects.SRevisionUpdated"); + Class.forName("org.bimserver.interfaces.objects.SGeoTagUpdated"); + Class.forName("org.bimserver.interfaces.objects.SPasswordChanged"); + Class.forName("org.bimserver.interfaces.objects.SUserChanged"); + Class.forName("org.bimserver.interfaces.objects.SExtendedDataAddedToRevision"); + Class.forName("org.bimserver.interfaces.objects.SExtendedDataAddedToProject"); + Class.forName("org.bimserver.interfaces.objects.SRemoteServiceCalled"); + Class.forName("org.bimserver.interfaces.objects.SGeometryInfo"); + Class.forName("org.bimserver.interfaces.objects.SVector3f"); + Class.forName("org.bimserver.interfaces.objects.SBounds"); + Class.forName("org.bimserver.interfaces.objects.SBuffer"); + Class.forName("org.bimserver.interfaces.objects.SGeometryData"); + Class.forName("org.bimserver.interfaces.objects.SVector4f"); Class.forName("org.bimserver.interfaces.objects.SUserType"); Class.forName("org.bimserver.interfaces.objects.SSIPrefix"); Class.forName("org.bimserver.interfaces.objects.SObjectState"); @@ -156,44 +194,6 @@ private void init() { Class.forName("org.bimserver.interfaces.objects.SRunServiceAuthorization"); Class.forName("org.bimserver.interfaces.objects.SDensityCollection"); Class.forName("org.bimserver.interfaces.objects.SDensity"); - Class.forName("org.bimserver.interfaces.objects.SAccessMethod"); - Class.forName("org.bimserver.interfaces.objects.SLogAction"); - Class.forName("org.bimserver.interfaces.objects.SServerLog"); - Class.forName("org.bimserver.interfaces.objects.SProjectRelated"); - Class.forName("org.bimserver.interfaces.objects.SCheckoutRelated"); - Class.forName("org.bimserver.interfaces.objects.SRevisionRelated"); - Class.forName("org.bimserver.interfaces.objects.SUserRelated"); - Class.forName("org.bimserver.interfaces.objects.SNewUserAdded"); - Class.forName("org.bimserver.interfaces.objects.SNewProjectAdded"); - Class.forName("org.bimserver.interfaces.objects.SRevisionBranched"); - Class.forName("org.bimserver.interfaces.objects.SNewRevisionAdded"); - Class.forName("org.bimserver.interfaces.objects.SNewCheckoutAdded"); - Class.forName("org.bimserver.interfaces.objects.SSettingsSaved"); - Class.forName("org.bimserver.interfaces.objects.SUserAddedToProject"); - Class.forName("org.bimserver.interfaces.objects.SNewObjectIDMUploaded"); - Class.forName("org.bimserver.interfaces.objects.SDownload"); - Class.forName("org.bimserver.interfaces.objects.SUserRemovedFromProject"); - Class.forName("org.bimserver.interfaces.objects.SProjectDeleted"); - Class.forName("org.bimserver.interfaces.objects.SUserDeleted"); - Class.forName("org.bimserver.interfaces.objects.SPasswordReset"); - Class.forName("org.bimserver.interfaces.objects.SDatabaseCreated"); - Class.forName("org.bimserver.interfaces.objects.SServerStarted"); - Class.forName("org.bimserver.interfaces.objects.SProjectUpdated"); - Class.forName("org.bimserver.interfaces.objects.SUserUndeleted"); - Class.forName("org.bimserver.interfaces.objects.SProjectUndeleted"); - Class.forName("org.bimserver.interfaces.objects.SRevisionUpdated"); - Class.forName("org.bimserver.interfaces.objects.SGeoTagUpdated"); - Class.forName("org.bimserver.interfaces.objects.SPasswordChanged"); - Class.forName("org.bimserver.interfaces.objects.SUserChanged"); - Class.forName("org.bimserver.interfaces.objects.SExtendedDataAddedToRevision"); - Class.forName("org.bimserver.interfaces.objects.SExtendedDataAddedToProject"); - Class.forName("org.bimserver.interfaces.objects.SRemoteServiceCalled"); - Class.forName("org.bimserver.interfaces.objects.SGeometryInfo"); - Class.forName("org.bimserver.interfaces.objects.SVector3f"); - Class.forName("org.bimserver.interfaces.objects.SBounds"); - Class.forName("org.bimserver.interfaces.objects.SBuffer"); - Class.forName("org.bimserver.interfaces.objects.SGeometryData"); - Class.forName("org.bimserver.interfaces.objects.SVector4f"); } catch (ClassNotFoundException e) { LOGGER.error("", e); } diff --git a/Tests/src/org/bimserver/test/RemoveEmpty.java b/Tests/src/org/bimserver/test/RemoveEmpty.java new file mode 100644 index 0000000000..20111a3584 --- /dev/null +++ b/Tests/src/org/bimserver/test/RemoveEmpty.java @@ -0,0 +1,32 @@ +package org.bimserver.test; + +import java.io.IOException; +import java.nio.file.DirectoryStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +public class RemoveEmpty { + public static void main(String[] args) { + new RemoveEmpty().start(); + } + + private void start() { + Path base = Paths.get("C:\\Users\\Ruben de Laat\\Documents\\debug"); + try { + DirectoryStream newDirectoryStream = Files.newDirectoryStream(base); + for (Path p : newDirectoryStream) { + DirectoryStream a = Files.newDirectoryStream(p); + int c = 0; + for (Path b : a) { + c++; + } + if (c == 1) { + org.apache.commons.io.FileUtils.deleteDirectory(p.toFile()); + } + } + } catch (IOException e) { + e.printStackTrace(); + } + } +}