From 58db6a16cfebdc653ebc8b27d12192152b5fd2d9 Mon Sep 17 00:00:00 2001 From: buczekp <buczekp> Date: Tue, 20 Apr 2010 09:06:38 +0000 Subject: [PATCH] [LMS-1457] removed old sample tracking criteria SVN: 15527 --- .../generic/server/TrackingServerLogger.java | 8 --- .../basic/dto/TrackingSampleCriteria.java | 61 ------------------- 2 files changed, 69 deletions(-) delete mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TrackingSampleCriteria.java diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServerLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServerLogger.java index 674e16b4baf..ee767835368 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServerLogger.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServerLogger.java @@ -25,7 +25,6 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewTrackingSampleCriteria; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TrackingDataSetCriteria; -import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TrackingSampleCriteria; import ch.systemsx.cisd.openbis.generic.shared.dto.Session; /** @@ -57,13 +56,6 @@ final class TrackingServerLogger extends AbstractServerLogger implements ITracki return null; } - public List<Sample> listSamples(String sessionToken, TrackingSampleCriteria criteria) - { - logTracking(sessionToken, "list_samples", "SAMPLE_TYPE(%s) LAST_SAMPLE_ID(%s)", criteria - .getSampleTypeCode(), criteria.getLastSeenSampleId()); - return null; - } - public List<Sample> listSamples(String sessionToken, NewTrackingSampleCriteria criteria) { logTracking(sessionToken, "list_samples", diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TrackingSampleCriteria.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TrackingSampleCriteria.java deleted file mode 100644 index 49afa5e79df..00000000000 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TrackingSampleCriteria.java +++ /dev/null @@ -1,61 +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.basic.dto; - -import java.io.Serializable; - -/** - * Criteria for tracking <i>samples</i> of a particular type with technical id bigger than the - * specified one. - * <p> - * Parent and Container samples should be loaded according to {@link SampleType} hierarchy depths. - * All referenced samples should have all properties loaded. - * - * @author Piotr Buczek - */ -// NOTE: It doesn't implement IsSerializable as it is not supposed to be used on the GWT client side -public class TrackingSampleCriteria implements Serializable -{ - private static final long serialVersionUID = ServiceVersionHolder.VERSION; - - private final String sampleTypeCode; - - private int lastSeenSampleId; - - public TrackingSampleCriteria(String sampleTypeCode, int lastSeenSampleId) - { - assert sampleTypeCode != null; - this.sampleTypeCode = sampleTypeCode; - this.lastSeenSampleId = lastSeenSampleId; - } - - public String getSampleTypeCode() - { - return sampleTypeCode; - } - - public int getLastSeenSampleId() - { - return lastSeenSampleId; - } - - public void setLastSeenSampleId(int lastSeenSampleId) - { - this.lastSeenSampleId = lastSeenSampleId; - } - -} -- GitLab