Skip to content
Snippets Groups Projects
Commit e0db7735 authored by ribeaudc's avatar ribeaudc
Browse files

[LMS-440] add: - Annotations to 'GroupDTO', 'ProjectDTO' and 'DatabaseInstanceDTO'.

- FIXME and TODOs that will be fixed very soon.
remove: - 'Group' and 'Project' client classes.
change: - 'GroupDTO' and 'ProjectDTO' moved to 'lims_base' project.

SVN: 6604
parent 223ae214
No related branches found
No related tags found
No related merge requests found
...@@ -27,9 +27,9 @@ import ch.systemsx.cisd.common.exceptions.CheckedExceptionTunnel; ...@@ -27,9 +27,9 @@ import ch.systemsx.cisd.common.exceptions.CheckedExceptionTunnel;
import ch.systemsx.cisd.common.utilities.Template; import ch.systemsx.cisd.common.utilities.Template;
import ch.systemsx.cisd.lims.base.dto.Experiment; import ch.systemsx.cisd.lims.base.dto.Experiment;
import ch.systemsx.cisd.lims.base.dto.ExternalData; import ch.systemsx.cisd.lims.base.dto.ExternalData;
import ch.systemsx.cisd.lims.base.dto.Group; import ch.systemsx.cisd.lims.base.dto.GroupDTO;
import ch.systemsx.cisd.lims.base.dto.Procedure; import ch.systemsx.cisd.lims.base.dto.Procedure;
import ch.systemsx.cisd.lims.base.dto.Project; import ch.systemsx.cisd.lims.base.dto.ProjectDTO;
/** /**
* An <code>IDirectoryRenderer</code> implementation which renders on HTML pages. * An <code>IDirectoryRenderer</code> implementation which renders on HTML pages.
...@@ -103,9 +103,9 @@ final class HTMLDirectoryRenderer implements IDirectoryRenderer ...@@ -103,9 +103,9 @@ final class HTMLDirectoryRenderer implements IDirectoryRenderer
final Procedure procedure = dataSet.getProcedure(); final Procedure procedure = dataSet.getProcedure();
final Experiment experiment = procedure.getExperiment(); final Experiment experiment = procedure.getExperiment();
final String experimentCode = experiment.getCode(); final String experimentCode = experiment.getCode();
final Project project = experiment.getProject(); final ProjectDTO project = experiment.getProject();
final String projectCode = project.getCode(); final String projectCode = project.getCode();
final Group group = project.getGroup(); final GroupDTO group = project.getGroup();
final String groupCode = group.getCode(); final String groupCode = group.getCode();
final Template template = HEADER_TEMPLATE.createFreshCopy(); final Template template = HEADER_TEMPLATE.createFreshCopy();
template.bind("group", groupCode); template.bind("group", groupCode);
......
...@@ -48,10 +48,10 @@ import ch.systemsx.cisd.common.utilities.OSUtilities; ...@@ -48,10 +48,10 @@ import ch.systemsx.cisd.common.utilities.OSUtilities;
import ch.systemsx.cisd.lims.base.IDataSetService; import ch.systemsx.cisd.lims.base.IDataSetService;
import ch.systemsx.cisd.lims.base.dto.Experiment; import ch.systemsx.cisd.lims.base.dto.Experiment;
import ch.systemsx.cisd.lims.base.dto.ExternalData; import ch.systemsx.cisd.lims.base.dto.ExternalData;
import ch.systemsx.cisd.lims.base.dto.Group; import ch.systemsx.cisd.lims.base.dto.GroupDTO;
import ch.systemsx.cisd.lims.base.dto.LocatorType; import ch.systemsx.cisd.lims.base.dto.LocatorType;
import ch.systemsx.cisd.lims.base.dto.Procedure; import ch.systemsx.cisd.lims.base.dto.Procedure;
import ch.systemsx.cisd.lims.base.dto.Project; import ch.systemsx.cisd.lims.base.dto.ProjectDTO;
/** /**
* @author Franz-Josef Elmer * @author Franz-Josef Elmer
...@@ -527,9 +527,9 @@ public class DatasetDownloadServletTest ...@@ -527,9 +527,9 @@ public class DatasetDownloadServletTest
private ExternalData createExternalData() private ExternalData createExternalData()
{ {
Group group = new Group(); GroupDTO group = new GroupDTO();
group.setCode(GROUP_CODE); group.setCode(GROUP_CODE);
Project project = new Project(); ProjectDTO project = new ProjectDTO();
project.setCode(PROJECT_CODE); project.setCode(PROJECT_CODE);
project.setGroup(group); project.setGroup(group);
Procedure procedure = new Procedure(); Procedure procedure = new Procedure();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment