From dad147edb9ab64682e32cf9430c830842eba6fc3 Mon Sep 17 00:00:00 2001 From: izabel <izabel> Date: Tue, 20 May 2008 21:15:21 +0000 Subject: [PATCH] SE-32 properties refactoring SVN: 6168 --- .../cisd/openbis/datasetdownload/DataSetService.java | 2 +- .../datasetdownload/DatasetDownloadServlet.java | 4 ++-- .../datasetdownload/HTMLDirectoryRenderer.java | 10 +++++----- .../openbis/datasetdownload/IDirectoryRenderer.java | 2 +- .../datasetdownload/PlainTextRendererFactory.java | 2 +- .../datasetdownload/DatasetDownloadServletTest.java | 12 ++++++------ 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/DataSetService.java b/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/DataSetService.java index 864eb3244e1..d88af4a9545 100644 --- a/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/DataSetService.java +++ b/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/DataSetService.java @@ -17,10 +17,10 @@ package ch.systemsx.cisd.openbis.datasetdownload; import ch.systemsx.cisd.common.exceptions.UserFailureException; -import ch.systemsx.cisd.lims.base.ExternalData; import ch.systemsx.cisd.lims.base.IDataSetService; import ch.systemsx.cisd.lims.base.ILIMSServiceFactory; import ch.systemsx.cisd.lims.base.ServiceRegistry; +import ch.systemsx.cisd.lims.base.dto.ExternalData; /** * 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 c5ada0e8390..a80eca58637 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 @@ -48,9 +48,9 @@ import ch.systemsx.cisd.common.exceptions.UserFailureException; import ch.systemsx.cisd.common.logging.LogCategory; import ch.systemsx.cisd.common.logging.LogFactory; import ch.systemsx.cisd.common.utilities.FileUtilities; -import ch.systemsx.cisd.lims.base.ExternalData; import ch.systemsx.cisd.lims.base.IDataSetService; -import ch.systemsx.cisd.lims.base.LocatorType; +import ch.systemsx.cisd.lims.base.dto.ExternalData; +import ch.systemsx.cisd.lims.base.dto.LocatorType; /** * @author Franz-Josef Elmer diff --git a/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/HTMLDirectoryRenderer.java b/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/HTMLDirectoryRenderer.java index 4335aec1f5a..fa6b8939b89 100644 --- a/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/HTMLDirectoryRenderer.java +++ b/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/HTMLDirectoryRenderer.java @@ -25,11 +25,11 @@ import org.apache.commons.lang.StringUtils; import ch.systemsx.cisd.common.exceptions.CheckedExceptionTunnel; import ch.systemsx.cisd.common.utilities.Template; -import ch.systemsx.cisd.lims.base.Experiment; -import ch.systemsx.cisd.lims.base.ExternalData; -import ch.systemsx.cisd.lims.base.Group; -import ch.systemsx.cisd.lims.base.Procedure; -import ch.systemsx.cisd.lims.base.Project; +import ch.systemsx.cisd.lims.base.dto.Experiment; +import ch.systemsx.cisd.lims.base.dto.ExternalData; +import ch.systemsx.cisd.lims.base.dto.Group; +import ch.systemsx.cisd.lims.base.dto.Procedure; +import ch.systemsx.cisd.lims.base.dto.Project; /** * An <code>IDirectoryRenderer</code> implementation which renders on HTML pages. diff --git a/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/IDirectoryRenderer.java b/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/IDirectoryRenderer.java index 9c808f16271..3d3d411d9f0 100644 --- a/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/IDirectoryRenderer.java +++ b/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/IDirectoryRenderer.java @@ -17,7 +17,7 @@ package ch.systemsx.cisd.openbis.datasetdownload; -import ch.systemsx.cisd.lims.base.ExternalData; +import ch.systemsx.cisd.lims.base.dto.ExternalData; /** * Interface of a renderer of a directory. diff --git a/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/PlainTextRendererFactory.java b/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/PlainTextRendererFactory.java index 371ae26344d..137908615a2 100644 --- a/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/PlainTextRendererFactory.java +++ b/dataset_download/source/java/ch/systemsx/cisd/openbis/datasetdownload/PlainTextRendererFactory.java @@ -20,7 +20,7 @@ import java.io.PrintWriter; import org.apache.commons.io.FileUtils; -import ch.systemsx.cisd.lims.base.ExternalData; +import ch.systemsx.cisd.lims.base.dto.ExternalData; /** * Factory for rendering file system view in plain text. 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 f5bbeadf32e..b551453faa4 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 @@ -45,13 +45,13 @@ import ch.systemsx.cisd.common.exceptions.CheckedExceptionTunnel; import ch.systemsx.cisd.common.logging.BufferedAppender; import ch.systemsx.cisd.common.utilities.FileUtilities; import ch.systemsx.cisd.common.utilities.OSUtilities; -import ch.systemsx.cisd.lims.base.Experiment; -import ch.systemsx.cisd.lims.base.ExternalData; -import ch.systemsx.cisd.lims.base.Group; import ch.systemsx.cisd.lims.base.IDataSetService; -import ch.systemsx.cisd.lims.base.LocatorType; -import ch.systemsx.cisd.lims.base.Procedure; -import ch.systemsx.cisd.lims.base.Project; +import ch.systemsx.cisd.lims.base.dto.Experiment; +import ch.systemsx.cisd.lims.base.dto.ExternalData; +import ch.systemsx.cisd.lims.base.dto.Group; +import ch.systemsx.cisd.lims.base.dto.LocatorType; +import ch.systemsx.cisd.lims.base.dto.Procedure; +import ch.systemsx.cisd.lims.base.dto.Project; /** * @author Franz-Josef Elmer -- GitLab