From 254df8a2496de9a4c01ada851d51af62b4d844ef Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Wed, 16 Jul 2014 08:03:17 +0000
Subject: [PATCH] SSDM-555: remove database instance column from web gui grids
SVN: 32073
---
.../web/client/dto/EntityTypeGridColumnIDs.java | 2 --
.../client/dto/ExperimentBrowserGridColumnIDs.java | 2 --
.../web/client/dto/MaterialGridColumnIDs.java | 2 --
.../client/web/client/dto/SampleGridColumnIDs.java | 2 --
.../server/resultset/AbstractMaterialProvider.java | 3 ---
.../web/server/resultset/EntityTypeProvider.java | 3 ---
.../web/server/resultset/ExperimentProvider.java | 4 ----
.../web/server/resultset/SampleProvider.java | 14 --------------
.../application/ui/sample/columns/SampleRow.java | 1 -
9 files changed, 33 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityTypeGridColumnIDs.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityTypeGridColumnIDs.java
index b42022b4d86..c0a0b28bce6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityTypeGridColumnIDs.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityTypeGridColumnIDs.java
@@ -27,7 +27,5 @@ public class EntityTypeGridColumnIDs
public static final String DESCRIPTION = "DESCRIPTION";
- public static final String DATABASE_INSTANCE = "DATABASE_INSTANCE";
-
public static final String VALIDATION_SCRIPT = "VALIDATION_SCRIPT";
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ExperimentBrowserGridColumnIDs.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ExperimentBrowserGridColumnIDs.java
index 1973c22e9b8..6285a09b47e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ExperimentBrowserGridColumnIDs.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ExperimentBrowserGridColumnIDs.java
@@ -29,8 +29,6 @@ public class ExperimentBrowserGridColumnIDs
public static final String EXPERIMENT_IDENTIFIER = "EXPERIMENT_IDENTIFIER";
- public static final String DATABASE_INSTANCE = "DATABASE_INSTANCE";
-
public static final String SPACE = "SPACE";
public static final String PROJECT = "PROJECT";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/MaterialGridColumnIDs.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/MaterialGridColumnIDs.java
index 4959b0b0303..b2025ac609b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/MaterialGridColumnIDs.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/MaterialGridColumnIDs.java
@@ -33,8 +33,6 @@ public class MaterialGridColumnIDs
public static final String MATERIAL_TYPE = "MATERIAL_TYPE";
- public static final String DATABASE_INSTANCE = "DATABASE_INSTANCE";
-
public static final String METAPROJECTS = "METAPROJECTS";
public static final String PROPERTIES_GROUP = "property-";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SampleGridColumnIDs.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SampleGridColumnIDs.java
index 8bb7dff1c3b..411516aaf40 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SampleGridColumnIDs.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SampleGridColumnIDs.java
@@ -39,8 +39,6 @@ public class SampleGridColumnIDs
public static final String METAPROJECTS = "METAPROJECTS";
- public static final String DATABASE_INSTANCE = "DATABASE_INSTANCE";
-
public static final String SAMPLE_IDENTIFIER = "SAMPLE_IDENTIFIER";
public static final String IS_INSTANCE_SAMPLE = "IS_INSTANCE_SAMPLE";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractMaterialProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractMaterialProvider.java
index b0db7ba273b..052e7d81330 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractMaterialProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractMaterialProvider.java
@@ -20,7 +20,6 @@ import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.CommonGridC
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExternalDataGridColumnIDs.REGISTRATION_DATE;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExternalDataGridColumnIDs.REGISTRATOR;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.MaterialGridColumnIDs.CODE;
-import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.MaterialGridColumnIDs.DATABASE_INSTANCE;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.MaterialGridColumnIDs.MATERIAL_TYPE;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.MaterialGridColumnIDs.METAPROJECTS;
@@ -48,7 +47,6 @@ public abstract class AbstractMaterialProvider extends AbstractTableModelProvide
TypedTableModelBuilder<Material> builder = new TypedTableModelBuilder<Material>();
builder.addColumn(CODE);
builder.addColumn(MATERIAL_TYPE).hideByDefault();
- builder.addColumn(DATABASE_INSTANCE).hideByDefault();
builder.addColumn(REGISTRATOR);
builder.addColumn(REGISTRATION_DATE).withDefaultWidth(200);
builder.addColumn(MODIFICATION_DATE).withDefaultWidth(200).hideByDefault();
@@ -59,7 +57,6 @@ public abstract class AbstractMaterialProvider extends AbstractTableModelProvide
builder.column(CODE).addEntityLink(material, material.getCode());
MaterialType materialType = material.getMaterialType();
builder.column(MATERIAL_TYPE).addString(materialType.getCode());
- builder.column(DATABASE_INSTANCE).addString(material.getDatabaseInstance().getCode());
builder.column(REGISTRATOR).addPerson(material.getRegistrator());
builder.column(REGISTRATION_DATE).addDate(material.getRegistrationDate());
builder.column(MODIFICATION_DATE).addDate(material.getModificationDate());
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityTypeProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityTypeProvider.java
index 961ba776f13..ac2ea7915eb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityTypeProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityTypeProvider.java
@@ -18,7 +18,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.server.resultset;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.CommonGridColumnIDs.MODIFICATION_DATE;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.EntityTypeGridColumnIDs.CODE;
-import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.EntityTypeGridColumnIDs.DATABASE_INSTANCE;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.EntityTypeGridColumnIDs.DESCRIPTION;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.EntityTypeGridColumnIDs.VALIDATION_SCRIPT;
@@ -49,7 +48,6 @@ public abstract class EntityTypeProvider<T extends EntityType> extends
TypedTableModelBuilder<T> builder = new TypedTableModelBuilder<T>();
builder.addColumn(CODE);
builder.addColumn(DESCRIPTION).withDefaultWidth(300);
- builder.addColumn(DATABASE_INSTANCE).hideByDefault();
builder.addColumn(MODIFICATION_DATE).withDefaultWidth(300).hideByDefault();
builder.addColumn(VALIDATION_SCRIPT).hideByDefault();
addMoreColumns(builder);
@@ -58,7 +56,6 @@ public abstract class EntityTypeProvider<T extends EntityType> extends
builder.addRow(type);
builder.column(CODE).addString(type.getCode());
builder.column(DESCRIPTION).addString(type.getDescription());
- builder.column(DATABASE_INSTANCE).addString(type.getDatabaseInstance().getCode());
builder.column(MODIFICATION_DATE).addDate(type.getModificationDate());
builder.column(VALIDATION_SCRIPT).addString(
type.getValidationScript() != null ? type.getValidationScript().getName() : "");
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ExperimentProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ExperimentProvider.java
index 2fe9242e8df..0cb84bb6a00 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ExperimentProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ExperimentProvider.java
@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.server.resultset;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.CommonGridColumnIDs.MODIFICATION_DATE;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.CommonGridColumnIDs.MODIFIER;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExperimentBrowserGridColumnIDs.CODE;
-import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExperimentBrowserGridColumnIDs.DATABASE_INSTANCE;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExperimentBrowserGridColumnIDs.EXPERIMENT_IDENTIFIER;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExperimentBrowserGridColumnIDs.EXPERIMENT_TYPE;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExperimentBrowserGridColumnIDs.IS_DELETED;
@@ -92,7 +91,6 @@ public class ExperimentProvider extends AbstractCommonTableModelProvider<Experim
builder.addColumn(CODE);
builder.addColumn(EXPERIMENT_TYPE).hideByDefault();
builder.addColumn(EXPERIMENT_IDENTIFIER).hideByDefault().withDefaultWidth(150);
- builder.addColumn(DATABASE_INSTANCE).hideByDefault();
builder.addColumn(SPACE).hideByDefault();
builder.addColumn(PROJECT).hideByDefault();
builder.addColumn(REGISTRATOR);
@@ -117,8 +115,6 @@ public class ExperimentProvider extends AbstractCommonTableModelProvider<Experim
builder.column(EXPERIMENT_TYPE).addString(experiment.getExperimentType().getCode());
builder.column(EXPERIMENT_IDENTIFIER).addEntityLink(experiment,
experiment.getIdentifier());
- builder.column(DATABASE_INSTANCE).addString(
- experiment.getProject().getSpace().getInstance().getCode());
builder.column(SPACE).addString(experiment.getProject().getSpace().getCode());
builder.column(PROJECT).addString(experiment.getProject().getCode());
builder.column(REGISTRATOR).addPerson(experiment.getRegistrator());
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleProvider.java
index 56273083cbe..79e7cf371b4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleProvider.java
@@ -20,7 +20,6 @@ import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.CommonGridC
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.CommonGridColumnIDs.MODIFIER;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.SampleGridColumnIDs.CODE;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.SampleGridColumnIDs.CONTAINER_SAMPLE;
-import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.SampleGridColumnIDs.DATABASE_INSTANCE;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.SampleGridColumnIDs.EXPERIMENT;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.SampleGridColumnIDs.EXPERIMENT_IDENTIFIER;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.SampleGridColumnIDs.IS_DELETED;
@@ -47,7 +46,6 @@ import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.id.metaproject.MetaprojectTechIdId;
import ch.systemsx.cisd.openbis.generic.shared.basic.DeletionUtils;
import ch.systemsx.cisd.openbis.generic.shared.basic.SimpleYesNoRenderer;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseInstance;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Experiment;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType;
@@ -76,7 +74,6 @@ public class SampleProvider extends AbstractCommonTableModelProvider<Sample>
TypedTableModelBuilder<Sample> builder = new TypedTableModelBuilder<Sample>();
builder.addColumn(CODE);
builder.addColumn(SUBCODE).hideByDefault();
- builder.addColumn(DATABASE_INSTANCE).hideByDefault();
builder.addColumn(SPACE).hideByDefault();
builder.addColumn(SAMPLE_IDENTIFIER).withDefaultWidth(150).hideByDefault();
builder.addColumn(SAMPLE_TYPE).withDefaultWidth(150).hideByDefault();
@@ -108,7 +105,6 @@ public class SampleProvider extends AbstractCommonTableModelProvider<Sample>
{
builder.column(CODE).addEntityLink(sample, sample.getCode());
builder.column(SUBCODE).addEntityLink(sample, sample.getSubCode());
- builder.column(DATABASE_INSTANCE).addString("");
builder.column(SPACE).addString(
sample.getSpace() == null ? "" : sample.getSpace().getCode());
builder.column(SAMPLE_IDENTIFIER).addEntityLink(sample, sample.getIdentifier());
@@ -179,16 +175,6 @@ public class SampleProvider extends AbstractCommonTableModelProvider<Sample>
return experiment == null ? "" : experiment.getProject().getCode();
}
- private DatabaseInstance getDatabaseInstance(Sample sample)
- {
- DatabaseInstance databaseInstance = sample.getDatabaseInstance();
- if (databaseInstance == null)
- {
- databaseInstance = sample.getSpace().getInstance();
- }
- return databaseInstance;
- }
-
private final List<Sample> getSamples()
{
switch (criteria.getCriteriaKind())
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/columns/SampleRow.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/columns/SampleRow.java
index 928a8ca7b60..0bc5a20c90c 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/columns/SampleRow.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/columns/SampleRow.java
@@ -50,7 +50,6 @@ public class SampleRow extends RowWithProperties
public SampleRow identifier(final String instanceCode, final String groupCodeOrNull)
{
- withCell(SampleGridColumnIDs.DATABASE_INSTANCE, instanceCode);
if (groupCodeOrNull == null)
{
withCell(SampleGridColumnIDs.SPACE, "");
--
GitLab