diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateMetadataBrowser.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateMetadataBrowser.java
index be482974fd22baac6386e3751c59cf6639295dff..c2ef89de9853f54ea98f99a31d9c1471ef1dc496 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateMetadataBrowser.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateMetadataBrowser.java
@@ -39,7 +39,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SerializableComparableI
import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.IScreeningClientServiceAsync;
import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.Dict;
import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.ScreeningDisplayTypeIDGenerator;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.StaticColumns;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.PlateMetadataStaticColumns;
/**
* Allows to create a table containing metadata of selected plate.
@@ -71,7 +71,7 @@ class PlateMetadataBrowser extends GenericTableBrowserGrid
ScreeningDisplayTypeIDGenerator.PLATE_METADATA_GRID);
screeningViewContext = viewContext;
this.sampleId = sampleId;
- registerLinkClickListenerFor(StaticColumns.WELL.colId(),
+ registerLinkClickListenerFor(PlateMetadataStaticColumns.WELL.colId(),
new ICellListener<GenericTableRow>()
{
public void handle(GenericTableRow rowItem)
@@ -79,7 +79,7 @@ class PlateMetadataBrowser extends GenericTableBrowserGrid
showEntityViewer(rowItem, false);
}
});
- registerLinkClickListenerFor(StaticColumns.CONTENT.colId(),
+ registerLinkClickListenerFor(PlateMetadataStaticColumns.CONTENT.colId(),
new ICellListener<GenericTableRow>()
{
public void handle(GenericTableRow rowItem)
@@ -87,7 +87,7 @@ class PlateMetadataBrowser extends GenericTableBrowserGrid
showMaterialViewer(rowItem, false);
}
});
- registerLinkClickListenerFor(StaticColumns.INHIBITED_GENE.colId(),
+ registerLinkClickListenerFor(PlateMetadataStaticColumns.INHIBITED_GENE.colId(),
new ICellListener<GenericTableRow>()
{
public void handle(GenericTableRow rowItem)
@@ -95,14 +95,14 @@ class PlateMetadataBrowser extends GenericTableBrowserGrid
showGeneViewer(rowItem, false);
}
});
- registerLinkClickListenerFor(StaticColumns.GENE_DETAILS.colId(),
+ registerLinkClickListenerFor(PlateMetadataStaticColumns.GENE_DETAILS.colId(),
new ICellListener<GenericTableRow>()
{
public void handle(GenericTableRow rowItem)
{
ISerializableComparable gene =
- rowItem.tryToGetValue(StaticColumns.INHIBITED_GENE.ordinal());
+ rowItem.tryToGetValue(PlateMetadataStaticColumns.INHIBITED_GENE.ordinal());
String geneCode = gene.toString();
// NOTE: If we want to include the gene library url in
// exported data we must configure it outside the dictionary
@@ -143,13 +143,13 @@ class PlateMetadataBrowser extends GenericTableBrowserGrid
public String getCode()
{
- return entity.tryToGetValue(StaticColumns.WELL.ordinal()).toString();
+ return entity.tryToGetValue(PlateMetadataStaticColumns.WELL.ordinal()).toString();
}
public Long getId()
{
return ((SerializableComparableIDDecorator) entity
- .tryToGetValue(StaticColumns.WELL.ordinal())).getID();
+ .tryToGetValue(PlateMetadataStaticColumns.WELL.ordinal())).getID();
}
public BasicEntityType getEntityType()
@@ -173,13 +173,13 @@ class PlateMetadataBrowser extends GenericTableBrowserGrid
public String getCode()
{
- return entity.tryToGetValue(StaticColumns.CONTENT.ordinal()).toString();
+ return entity.tryToGetValue(PlateMetadataStaticColumns.CONTENT.ordinal()).toString();
}
public Long getId()
{
return ((SerializableComparableIDDecorator) entity
- .tryToGetValue(StaticColumns.CONTENT.ordinal())).getID();
+ .tryToGetValue(PlateMetadataStaticColumns.CONTENT.ordinal())).getID();
}
public BasicEntityType getEntityType()
@@ -203,13 +203,13 @@ class PlateMetadataBrowser extends GenericTableBrowserGrid
public String getCode()
{
- return entity.tryToGetValue(StaticColumns.INHIBITED_GENE.ordinal()).toString();
+ return entity.tryToGetValue(PlateMetadataStaticColumns.INHIBITED_GENE.ordinal()).toString();
}
public Long getId()
{
return ((SerializableComparableIDDecorator) entity
- .tryToGetValue(StaticColumns.INHIBITED_GENE.ordinal())).getID();
+ .tryToGetValue(PlateMetadataStaticColumns.INHIBITED_GENE.ordinal())).getID();
}
public BasicEntityType getEntityType()
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/PlateMetadataProvider.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/PlateMetadataProvider.java
index 28093ceb544bb78bf80c1b7a61268ea90ec082ad..321653f6050157cfbe6c17153b7066512bcffc31 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/PlateMetadataProvider.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/PlateMetadataProvider.java
@@ -33,7 +33,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Material;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
import ch.systemsx.cisd.openbis.plugin.screening.shared.IScreeningServer;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.PlateContent;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.StaticColumns;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.PlateMetadataStaticColumns;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellMetadata;
/**
@@ -89,34 +89,34 @@ class PlateMetadataProvider implements IOriginalDataProvider<GenericTableRow>
{
List<Column> columns = new ArrayList<Column>();
Column codeColumn =
- new Column(GenericTableColumnHeader.untitledLinkableStringHeader(StaticColumns.WELL
- .ordinal(), StaticColumns.WELL.colId()));
+ new Column(GenericTableColumnHeader.untitledLinkableStringHeader(PlateMetadataStaticColumns.WELL
+ .ordinal(), PlateMetadataStaticColumns.WELL.colId()));
columns.add(codeColumn);
Column typeColumn =
- new Column(GenericTableColumnHeader.untitledStringHeader(StaticColumns.TYPE
- .ordinal(), StaticColumns.TYPE.colId()));
+ new Column(GenericTableColumnHeader.untitledStringHeader(PlateMetadataStaticColumns.TYPE
+ .ordinal(), PlateMetadataStaticColumns.TYPE.colId()));
columns.add(typeColumn);
Column contentColumn =
new Column(GenericTableColumnHeader.untitledLinkableStringHeader(
- StaticColumns.CONTENT.ordinal(), StaticColumns.CONTENT.colId()));
+ PlateMetadataStaticColumns.CONTENT.ordinal(), PlateMetadataStaticColumns.CONTENT.colId()));
columns.add(contentColumn);
Column contentTypeColumn =
- new Column(GenericTableColumnHeader.untitledStringHeader(StaticColumns.CONTENT_TYPE
- .ordinal(), StaticColumns.CONTENT_TYPE.colId()));
+ new Column(GenericTableColumnHeader.untitledStringHeader(PlateMetadataStaticColumns.CONTENT_TYPE
+ .ordinal(), PlateMetadataStaticColumns.CONTENT_TYPE.colId()));
columns.add(contentTypeColumn);
Column geneCodeColumn =
new Column(GenericTableColumnHeader.untitledLinkableStringHeader(
- StaticColumns.INHIBITED_GENE.ordinal(), StaticColumns.INHIBITED_GENE
+ PlateMetadataStaticColumns.INHIBITED_GENE.ordinal(), PlateMetadataStaticColumns.INHIBITED_GENE
.colId()));
columns.add(geneCodeColumn);
Column showGeneColumn =
new Column(GenericTableColumnHeader.untitledLinkableStringHeader(
- StaticColumns.GENE_DETAILS.ordinal(), StaticColumns.GENE_DETAILS.colId()));
+ PlateMetadataStaticColumns.GENE_DETAILS.ordinal(), PlateMetadataStaticColumns.GENE_DETAILS.colId()));
columns.add(showGeneColumn);
int fixedColumns = columns.size();
PropertyColumns contentPropertyColumns = new PropertyColumns();
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/StaticColumns.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/PlateMetadataStaticColumns.java
similarity index 77%
rename from screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/StaticColumns.java
rename to screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/PlateMetadataStaticColumns.java
index 310b94cd68e810c63fe0ee22bf63ddfdbc51d6b0..df4de958e992b3d01010d4053ee19244f35f5af9 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/StaticColumns.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/PlateMetadataStaticColumns.java
@@ -18,28 +18,28 @@ package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
/**
* Defines static columns of plate metadata row.
- *
+ *
* @author Izabela Adamczyk
*/
-public enum StaticColumns
+public enum PlateMetadataStaticColumns
{
- WELL("CODE"),
+ WELL("Code"),
- TYPE("TYPE"),
+ TYPE("Type"),
- CONTENT("CONTENT"),
+ CONTENT("Content"),
- CONTENT_TYPE("CONTENT_TYPE"),
+ CONTENT_TYPE("Content Type"),
- INHIBITED_GENE("INHIBITED_GENE"),
+ INHIBITED_GENE("Inhibited Gene"),
- GENE_DETAILS("GENE_DETAILS"),
+ GENE_DETAILS("Gene Details"),
THUMBNAIL("THUMBNAIL");
private final String id;
- private StaticColumns(String id)
+ private PlateMetadataStaticColumns(String id)
{
this.id = id;
}