diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/imaging/ImagingDataSetConfig.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/imaging/ImagingDataSetConfig.java index c7a1354a927470bb8dca7c1d0edee210a5c5e5d7..7ce7ed60b56e81ba8617b11eefda81e9ce642505 100644 --- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/imaging/ImagingDataSetConfig.java +++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/imaging/ImagingDataSetConfig.java @@ -144,4 +144,10 @@ public class ImagingDataSetConfig implements Serializable { this.metaData = metaData; } + + @Override + public String toString() + { + return "ImagingDataSetConfig: " + adaptor; + } } diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/imaging/ImagingDataSetControl.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/imaging/ImagingDataSetControl.java index 685f67a411a77139c26b6c8629dc71e3e93fb482..676549859dcc0392372795bba39b12eafbd9d042 100644 --- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/imaging/ImagingDataSetControl.java +++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/imaging/ImagingDataSetControl.java @@ -141,4 +141,10 @@ public class ImagingDataSetControl implements Serializable { this.metaData = metaData; } + + @Override + public String toString() + { + return "ImagingDataSetControl: " + label; + } } diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/imaging/ImagingDataSetImage.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/imaging/ImagingDataSetImage.java index cd495e81399fc693f1d44940efccf73a47482093..811b5b05ac48b350bce6ac4bf72654f01a508e2e 100644 --- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/imaging/ImagingDataSetImage.java +++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/imaging/ImagingDataSetImage.java @@ -59,4 +59,10 @@ public class ImagingDataSetImage implements Serializable this.metaData = metaData; } + @Override + public String toString() + { + return "ImagingDataSetImage:"; + } + } diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/imaging/ImagingDataSetPreview.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/imaging/ImagingDataSetPreview.java index 5bbbf46e88a67a550769b5ae46c0e176f99cf658..848ccd751c67372991b8372aff67b24aae074129 100644 --- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/imaging/ImagingDataSetPreview.java +++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/imaging/ImagingDataSetPreview.java @@ -101,4 +101,10 @@ public class ImagingDataSetPreview implements Serializable this.metaData = metaData; } + @Override + public String toString() + { + return "ImagingDataSetPreview:"; + } + } diff --git a/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/dictionary.txt b/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/dictionary.txt index cd96cb853bee376ccb8623ddc11404b0adc861f7..edec8005e1c20c8b41de650006b9ce4adfbaabc9 100644 --- a/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/dictionary.txt +++ b/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/dictionary.txt @@ -769,6 +769,7 @@ get Web App Settings get Wished Number Of Streams getAccessDate getActions +getAdaptor getAddress getAddressType getAllowProjectSamples @@ -782,6 +783,7 @@ GetAuthorization Groups Operation Result getAvailability getAvailabilityTime getBooleanProperty +getBytes getCacheMode getChecksum getChecksumCRC32 @@ -793,6 +795,7 @@ getComparator getComplete getComponentIds getComponents +getConfig getContainer getContainerId getContainerIds @@ -849,6 +852,7 @@ getExperimentsByType GetExperimentsOperation GetExperimentsOperationResult getExportableKind +getExports getExternalCode getExternalDataManagementSystems getExternalDms @@ -893,6 +897,7 @@ getImportData getImportMode getImportOptions getInitialValueForExistingEntities +getInputs getInputStream getIntegerArrayProperty getIntegerProperty @@ -974,10 +979,12 @@ getPersonalAccessTokenSessionName GetPersonalAccessTokensOperation GetPersonalAccessTokensOperationResult getPhysicalData +getPlayable getPluginId getPredicateAccessionId getPredicateOntologyId getPredicateOntologyVersion +getPreviews getPreviousVersion getProgress getProject @@ -993,8 +1000,10 @@ getPropertyAsString getPropertyName getPropertyTypeId getPropertyValue +getRange getRealArrayProperty getRealProperty +getResolutions getReason getRegistrationDate getRegistrator @@ -1039,6 +1048,7 @@ getSpacesByType GetSpacesOperation GetSpacesOperationResult getSpeedHint +getSpeeds getStartDate getState getStatus @@ -1072,6 +1082,7 @@ getValidFromDate getValidTo getValidToDate getValue +getValues getVarcharProperty getVersion getVocabulary @@ -1255,6 +1266,10 @@ IGNORE_EXISTING IIdentifierHolder IImportData ILocatorTypeId +ImagingDataSetConfig +ImagingDataSetControl +ImagingDataSetImage +ImagingDataSetPreview IMaterialId IMetaDataUpdateHolder IModificationDateHolder @@ -1344,6 +1359,7 @@ isH5Folders isListable isMeasured isModified +isMultiselect isMultiValue isNegated isOfficial @@ -1352,11 +1368,13 @@ isOpenBIS ISpaceHolder ISpaceId isPersonalAccessTokenSession +isPlayable isPostRegistered isPresentInArchive isPrivate isRecursive isSemanticAnnotationsInherited +isShow isShowContainer isShowParentMetadata isShowParents @@ -2022,6 +2040,7 @@ set Web App Settings setAccessDate setActions setActive +setAdaptor setAddress setAddressType setAllowProjectSamples @@ -2034,6 +2053,7 @@ setAutoGeneratedCode setAvailability setAvailabilityTime setBooleanProperty +setBytes setChecksum setChecksumCRC32 setChecksumType @@ -2045,6 +2065,7 @@ setComplete setComponentActions setComponentIds setComponents +setConfig setContainer setContainerActions setContainerId @@ -2092,6 +2113,7 @@ setExperimentId setExperiments setExperimentsByType setExportableKind +setExports setExternalCode setExternalDms setExternalDmsAddress @@ -2130,6 +2152,7 @@ setImportData setImportMode setImportOptions setInitialValueForExistingEntities +setInputs setIntegerArrayProperty setIntegerProperty setJsonProperty @@ -2158,6 +2181,7 @@ setMode setModificationDate setModifier setMultilineVarcharProperty +setMultiselect setMultiValue setMultiValueBooleanProperty setMultiValueControlledVocabularyProperty @@ -2199,12 +2223,14 @@ setPersonalAccessTokenId setPersonalAccessTokenSession setPersonalAccessTokenSessionName setPhysicalData +setPlayable setPluginId setPostRegistered setPredicateAccessionId setPredicateOntologyId setPredicateOntologyVersion setPresentInArchive +setPreviews setPreviousVersion setPrivate setProgress @@ -2218,6 +2244,7 @@ setPropertyAssignmentId setPropertyName setPropertyTypeId setPropertyValue +setRange setRealArrayProperty setRealProperty setReason @@ -2229,6 +2256,7 @@ setRelatedObjectId setRelationType setRemoteUrl setRenderResult +setResolutions setResults setSample setSampleId @@ -2239,6 +2267,7 @@ setSemanticAnnotations setSemanticAnnotationsInherited setSessionName setShareId +setShow setShowContainer setShowParentMetadata setShowParents @@ -2248,6 +2277,7 @@ setSpace setSpaceId setSpacesByType setSpeedHint +setSpeeds setStartDate setState setStatus @@ -2280,6 +2310,7 @@ setValidFromDate setValidTo setValidToDate setValue +setValues setVarcharProperty setVersion SetView diff --git a/api-openbis-javascript/src/v3/dss/dto/imaging/ImagingDataSetConfig.js b/api-openbis-javascript/src/v3/dss/dto/imaging/ImagingDataSetConfig.js index d1d907591d1bd43d5ab4ca3277f3cd58def892d9..c44fe0fac0f436f2cfd003518eb036709e0e4e08 100644 --- a/api-openbis-javascript/src/v3/dss/dto/imaging/ImagingDataSetConfig.js +++ b/api-openbis-javascript/src/v3/dss/dto/imaging/ImagingDataSetConfig.js @@ -61,6 +61,9 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) { prototype.setMetaData = function(metaData) { this.metaData = metaData; }; + prototype.toString = function() { + return "ImagingDataSetConfig: " + this.adaptor; + }; }, { resolutions : { diff --git a/api-openbis-javascript/src/v3/dss/dto/imaging/ImagingDataSetControl.js b/api-openbis-javascript/src/v3/dss/dto/imaging/ImagingDataSetControl.js index 8033508ad59c995be46efc00104ea84c134d9004..c482422dcc2fd611b4e751a06d8d4133823670f2 100644 --- a/api-openbis-javascript/src/v3/dss/dto/imaging/ImagingDataSetControl.js +++ b/api-openbis-javascript/src/v3/dss/dto/imaging/ImagingDataSetControl.js @@ -61,6 +61,9 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) { prototype.setMetaData = function(metaData) { this.metaData = metaData; }; + prototype.toString = function() { + return "ImagingDataSetControl: " + this.label; + }; }, { values : { diff --git a/api-openbis-javascript/src/v3/dss/dto/imaging/ImagingDataSetImage.js b/api-openbis-javascript/src/v3/dss/dto/imaging/ImagingDataSetImage.js index d7906ab8beee97e3beb014a679b1418055477381..cabcef4beca86e165149c8398864e4d340ce3826 100644 --- a/api-openbis-javascript/src/v3/dss/dto/imaging/ImagingDataSetImage.js +++ b/api-openbis-javascript/src/v3/dss/dto/imaging/ImagingDataSetImage.js @@ -19,6 +19,9 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) { prototype.setMetaData = function(metaData) { this.metaData = metaData; }; + prototype.toString = function() { + return "ImagingDataSetImage: " + this.previews; + }; }, { previews : { diff --git a/api-openbis-javascript/src/v3/dss/dto/imaging/ImagingDataSetPreview.js b/api-openbis-javascript/src/v3/dss/dto/imaging/ImagingDataSetPreview.js index dbf83517ea093623bc966cd14bc10bb3afc70de4..c26df73521e46048f545feba9724887acdfa79dc 100644 --- a/api-openbis-javascript/src/v3/dss/dto/imaging/ImagingDataSetPreview.js +++ b/api-openbis-javascript/src/v3/dss/dto/imaging/ImagingDataSetPreview.js @@ -40,6 +40,9 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) { prototype.setMetaData = function(metaData) { this.metaData = metaData; }; + prototype.toString = function() { + return "ImagingDataSetPreview: " + this.config; + }; }, { config : {