From d3223c7b0464bed350a17b615e6ba925aa981b4f Mon Sep 17 00:00:00 2001 From: ribeaudc <ribeaudc> Date: Sun, 21 Dec 2008 02:31:50 +0000 Subject: [PATCH] change: - Move some DTOs from 'openbis' 'ch.systemsx.cisd.openbis.generic.shared.dto' package to 'lims_base' 'ch.systemsx.cisd.lims.base.dto' one. SVN: 9451 --- .../DatasetDownloadServlet.java | 2 +- .../DatasetDownloadServletTest.java | 2 +- .../generic/shared/dto/DataSetType.java | 39 ------ .../generic/shared/dto/EntityType.java | 55 --------- .../dto/EntityTypeMandatorilyRelation.java | 110 ----------------- .../generic/shared/dto/ExperimentType.java | 29 ----- .../generic/shared/dto/FileFormatType.java | 41 ------- .../generic/shared/dto/LocatorType.java | 41 ------- .../generic/shared/dto/ProcedureType.java | 64 ---------- .../dto/PropertyTypeEntityTypeRelation.java | 116 ------------------ .../generic/shared/dto/SampleType.java | 82 ------------- 11 files changed, 2 insertions(+), 579 deletions(-) delete mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetType.java delete mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityType.java delete mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypeMandatorilyRelation.java delete mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentType.java delete mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/FileFormatType.java delete mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/LocatorType.java delete mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProcedureType.java delete mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PropertyTypeEntityTypeRelation.java delete mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleType.java diff --git a/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/DatasetDownloadServlet.java b/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/DatasetDownloadServlet.java index 289cd8f9e10..b410f8382b1 100644 --- a/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/DatasetDownloadServlet.java +++ b/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/DatasetDownloadServlet.java @@ -49,8 +49,8 @@ import ch.systemsx.cisd.common.filesystem.FileUtilities; import ch.systemsx.cisd.common.logging.LogCategory; import ch.systemsx.cisd.common.logging.LogFactory; import ch.systemsx.cisd.lims.base.IDataSetService; +import ch.systemsx.cisd.lims.base.dto.LocatorType; import ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE; -import ch.systemsx.cisd.openbis.generic.shared.dto.LocatorType; import ch.systemsx.cisd.openbis.generic.shared.dto.LocatorTypePE; /** diff --git a/dataset_download/sourceTest/java/ch/systemsx/cisd/openbis/datasetdownload/DatasetDownloadServletTest.java b/dataset_download/sourceTest/java/ch/systemsx/cisd/openbis/datasetdownload/DatasetDownloadServletTest.java index eccf60374b1..0b497ab1223 100644 --- a/dataset_download/sourceTest/java/ch/systemsx/cisd/openbis/datasetdownload/DatasetDownloadServletTest.java +++ b/dataset_download/sourceTest/java/ch/systemsx/cisd/openbis/datasetdownload/DatasetDownloadServletTest.java @@ -47,10 +47,10 @@ import ch.systemsx.cisd.common.logging.BufferedAppender; import ch.systemsx.cisd.common.utilities.OSUtilities; import ch.systemsx.cisd.lims.base.IDataSetService; import ch.systemsx.cisd.lims.base.dto.ExternalData; +import ch.systemsx.cisd.lims.base.dto.LocatorType; import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE; import ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE; import ch.systemsx.cisd.openbis.generic.shared.dto.GroupPE; -import ch.systemsx.cisd.openbis.generic.shared.dto.LocatorType; import ch.systemsx.cisd.openbis.generic.shared.dto.LocatorTypePE; import ch.systemsx.cisd.openbis.generic.shared.dto.ProcedurePE; import ch.systemsx.cisd.openbis.generic.shared.dto.ProjectPE; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetType.java deleted file mode 100644 index 074c0f40c62..00000000000 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetType.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2007 ETH Zuerich, CISD - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package ch.systemsx.cisd.openbis.generic.shared.dto; - -import ch.systemsx.cisd.openbis.generic.shared.GenericSharedConstants; - -/** - * Kind of <i>Java Bean</i> or <i>Value Object</i> which transports through Web Service any - * information we would like to know about an data set type. - * - * @author Christian Ribeaud - */ -public final class DataSetType extends EntityType -{ - private static final long serialVersionUID = GenericSharedConstants.VERSION; - - public DataSetType() - { - } - - public DataSetType(final String code) - { - setCode(code); - } -} diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityType.java deleted file mode 100644 index 59583e32612..00000000000 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityType.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2008 ETH Zuerich, CISD - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package ch.systemsx.cisd.openbis.generic.shared.dto; - -import ch.systemsx.cisd.openbis.generic.shared.GenericSharedConstants; - -/** - * An <i>abstract</i> <code>Code</code> extension for types. - * - * @author Christian Ribeaud - */ -public class EntityType extends Code<EntityType> implements IEntityType -{ - private static final long serialVersionUID = GenericSharedConstants.VERSION; - - private String description; - - public EntityType() - { - } - - public EntityType(final String code, final String description) - { - setCode(code); - setDescription(description); - } - - // - // IEntityType - // - - public final String getDescription() - { - return description; - } - - public final void setDescription(final String description) - { - this.description = description; - } -} diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypeMandatorilyRelation.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypeMandatorilyRelation.java deleted file mode 100644 index 147431f0fad..00000000000 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypeMandatorilyRelation.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright 2007 ETH Zuerich, CISD - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package ch.systemsx.cisd.openbis.generic.shared.dto; - -import java.io.Serializable; - -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; - -import ch.systemsx.cisd.openbis.generic.shared.GenericSharedConstants; - -/** - * @author Franz-Josef Elmer - */ -public class EntityTypeMandatorilyRelation implements Serializable, - Comparable<EntityTypeMandatorilyRelation> -{ - private static final long serialVersionUID = GenericSharedConstants.VERSION; - - public static final EntityTypeMandatorilyRelation[] EMPTY_ARRAY = - new EntityTypeMandatorilyRelation[0]; - - private EntityType type; - - private boolean mandatory; - - public final boolean isMandatory() - { - return mandatory; - } - - public final void setMandatory(final boolean mandatory) - { - this.mandatory = mandatory; - } - - public final EntityType getEntityType() - { - return type; - } - - public final void setEntityType(final EntityType materialType) - { - this.type = materialType; - } - - // - // Object - // - - @Override - public final boolean equals(final Object obj) - { - if (obj == this) - { - return true; - } - if (obj instanceof EntityTypeMandatorilyRelation == false) - { - return false; - } - final EntityTypeMandatorilyRelation that = (EntityTypeMandatorilyRelation) obj; - final EqualsBuilder builder = new EqualsBuilder(); - builder.append(that.type, type); - return builder.isEquals(); - } - - @Override - public final int hashCode() - { - final HashCodeBuilder builder = new HashCodeBuilder(); - builder.append(type); - return builder.toHashCode(); - } - - // - // Comparable - // - - /** - * If <code>null</code> values are present for <code>type</code>, then they come first. - */ - public final int compareTo(final EntityTypeMandatorilyRelation o) - { - final EntityType thatType = o.type; - if (type == null) - { - return thatType == null ? 0 : -1; - } - if (thatType == null) - { - return 1; - } - return type.compareTo(thatType); - } -} diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentType.java deleted file mode 100644 index 8e5eff2b454..00000000000 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2007 ETH Zuerich, CISD - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package ch.systemsx.cisd.openbis.generic.shared.dto; - -import ch.systemsx.cisd.openbis.generic.shared.GenericSharedConstants; - -/** - * The type of an experiment. - * - * @author Christian Ribeaud - */ -public final class ExperimentType extends EntityType -{ - private static final long serialVersionUID = GenericSharedConstants.VERSION; -} \ No newline at end of file diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/FileFormatType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/FileFormatType.java deleted file mode 100644 index facdd283e7c..00000000000 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/FileFormatType.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2007 ETH Zuerich, CISD - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package ch.systemsx.cisd.openbis.generic.shared.dto; - -import ch.systemsx.cisd.openbis.generic.shared.GenericSharedConstants; - -/** - * Kind of <i>Java Bean</i> or <i>Value Object</i> which transports through Web Service any - * information we would like to know about a file format type. - * - * @author Christian Ribeaud - */ -public final class FileFormatType extends EntityType -{ - private static final long serialVersionUID = GenericSharedConstants.VERSION; - - public static final String DEFAULT_FILE_FORMAT_TYPE_CODE = "TIFF"; - - public FileFormatType() - { - } - - public FileFormatType(final String code) - { - setCode(code); - } -} diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/LocatorType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/LocatorType.java deleted file mode 100644 index a5a6f593624..00000000000 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/LocatorType.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2007 ETH Zuerich, CISD - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package ch.systemsx.cisd.openbis.generic.shared.dto; - -import ch.systemsx.cisd.openbis.generic.shared.GenericSharedConstants; - -/** - * Kind of <i>Java Bean</i> or <i>Value Object</i> which contains any information we would like to - * know about a locator type. - * - * @author Christian Ribeaud - */ -public final class LocatorType extends EntityType -{ - private static final long serialVersionUID = GenericSharedConstants.VERSION; - - public static final String DEFAULT_LOCATOR_TYPE_CODE = "RELATIVE_LOCATION"; - - public LocatorType() - { - } - - public LocatorType(final String code) - { - setCode(code); - } -} \ No newline at end of file diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProcedureType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProcedureType.java deleted file mode 100644 index 4cb6478b399..00000000000 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProcedureType.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2007 ETH Zuerich, CISD - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package ch.systemsx.cisd.openbis.generic.shared.dto; - -import ch.systemsx.cisd.openbis.generic.shared.GenericSharedConstants; -import ch.systemsx.cisd.openbis.generic.shared.dto.types.ProcedureTypeCode; - -/** - * Kind of <i>Java Bean</i> or <i>Value Object</i> which transports through Web Service any - * information we would like to know about a procedure type. - * - * @author Christian Ribeaud - */ -public final class ProcedureType extends EntityType -{ - private static final long serialVersionUID = GenericSharedConstants.VERSION; - - private boolean dataAcquisition; - - public ProcedureType() - { - } - - public ProcedureType(final String code) - { - ProcedureTypeCode procedureTypeCode = ProcedureTypeCode.getProcedureTypeCode(code); - setCode(procedureTypeCode.getCode()); - // TODO 2008-04-17, Franz-Josef Elmer: data acquisition flag should come from application - // server - setDataAcquisition(procedureTypeCode == ProcedureTypeCode.DATA_ACQUISITION); - } - - /** - * Returns <code>true</code> if and only if this procedure type represents a data acquisition - * (or measurement) rather than a data processing (or derivation) step in a workflow. - */ - public final boolean isDataAcquisition() - { - return dataAcquisition; - } - - /** - * Sets the attribute which determines whether this procedure type represents a data acquisition - * (or measurement) rather than a data processing (or derivation) step in a workflow. - */ - public final void setDataAcquisition(final boolean dataAcquisition) - { - this.dataAcquisition = dataAcquisition; - } -} diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PropertyTypeEntityTypeRelation.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PropertyTypeEntityTypeRelation.java deleted file mode 100644 index f1b9b2dee57..00000000000 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PropertyTypeEntityTypeRelation.java +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright 2007 ETH Zuerich, CISD - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package ch.systemsx.cisd.openbis.generic.shared.dto; - -import java.io.Serializable; -import java.util.Comparator; - -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; - -import ch.systemsx.cisd.openbis.generic.shared.GenericSharedConstants; - -/** - * Class that defines a relation between a {@link PropertyTypePE} and a - * {@link EntityTypeMandatorilyRelation}. - * - * @author Franz-Josef Elmer - */ -public final class PropertyTypeEntityTypeRelation implements Serializable -{ - private static final long serialVersionUID = GenericSharedConstants.VERSION; - - public static final PropertyTypeEntityTypeRelation[] EMPTY_ARRAY = - new PropertyTypeEntityTypeRelation[0]; - - private PropertyTypePE property; - - private EntityTypeMandatorilyRelation[] relations = new EntityTypeMandatorilyRelation[0]; - - public final PropertyTypePE getProperty() - { - return property; - } - - public final void setProperty(final PropertyTypePE property) - { - this.property = property; - } - - public final EntityTypeMandatorilyRelation[] getRelations() - { - return relations; - } - - public final void setRelations(final EntityTypeMandatorilyRelation[] relations) - { - this.relations = relations; - } - - // - // Object - // - - @Override - public final boolean equals(final Object obj) - { - if (obj == this) - { - return true; - } - if (obj instanceof PropertyTypeEntityTypeRelation == false) - { - return false; - } - final PropertyTypeEntityTypeRelation that = (PropertyTypeEntityTypeRelation) obj; - final EqualsBuilder builder = new EqualsBuilder(); - builder.append(that.property, property); - return builder.isEquals(); - } - - @Override - public final int hashCode() - { - final HashCodeBuilder builder = new HashCodeBuilder(); - builder.append(property); - return builder.toHashCode(); - } - - public static Comparator<PropertyTypeEntityTypeRelation> cerateComparator() - { - return new Comparator<PropertyTypeEntityTypeRelation>() - { - - public int compare(final PropertyTypeEntityTypeRelation o1, - final PropertyTypeEntityTypeRelation o2) - { - final PropertyTypePE property1 = o1.getProperty(); - final PropertyTypePE property2 = o2.getProperty(); - if (property1 == null) - { - return property2 == null ? 0 : -1; - } - if (property2 == null) - { - return 1; - } - return property1.compareTo(property2); - } - - }; - } -} diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleType.java deleted file mode 100644 index 22248baaf4d..00000000000 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleType.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright 2007 ETH Zuerich, CISD - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package ch.systemsx.cisd.openbis.generic.shared.dto; - -import ch.systemsx.cisd.openbis.generic.shared.GenericSharedConstants; - -/** - * Kind of <i>Java Bean</i> or <i>Value Object</i> which transports through Web Service any - * information we would like to know about a sample type. - * - * @author Christian Ribeaud - */ -public final class SampleType extends EntityType -{ - private static final long serialVersionUID = GenericSharedConstants.VERSION; - - public static final SampleType[] EMPTY_ARRAY = new SampleType[0]; - - private boolean plate; - - private boolean controlLayout; - - private int generatedFromHierarchyDepth; - - private int partOfHierarchyDepth; - - public final boolean isPlate() - { - return plate; - } - - public final void setPlate(boolean plate) - { - this.plate = plate; - } - - public final boolean isControlLayout() - { - return controlLayout; - } - - public final void setControlLayout(final boolean controlLayout) - { - this.controlLayout = controlLayout; - } - - public void setGeneratedFromHierarchyDepth(int generatedFromHierarchyDepth) - { - this.generatedFromHierarchyDepth = generatedFromHierarchyDepth; - - } - - public void setPartOfHierarchyDepth(int partOfHierarchyDepth) - { - this.partOfHierarchyDepth = partOfHierarchyDepth; - - } - - public int getGeneratedFromHierarchyDepth() - { - return generatedFromHierarchyDepth; - } - - public int getPartOfHierarchyDepth() - { - return partOfHierarchyDepth; - } -} -- GitLab