diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid2.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid2.java
index 2dcab5fae0bb085d68021088a4dfbcf9c5d61d42..3f8767adc202019e2c9dd55bcc9c9f5d64fd42bc 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid2.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid2.java
@@ -374,7 +374,7 @@ public class SampleBrowserGrid2 extends TypedTableGrid<Sample>
}
};
registerListenerAndLinkGenerator(SampleGridColumnIDs.EXPERIMENT, listenerLinkGenerator);
- registerListenerAndLinkGenerator(SampleGridColumnIDs.EXPERIMENT_IDENTFIER,
+ registerListenerAndLinkGenerator(SampleGridColumnIDs.EXPERIMENT_IDENTIFIER,
listenerLinkGenerator);
}
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 4b086b4ccaa96419b57b049fd649087991832070..f76ce82d9e0ba9e50f2862b4f406ac6684d2df8c 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
@@ -46,7 +46,7 @@ public class SampleGridColumnIDs
public static final String EXPERIMENT = "EXPERIMENT";
- public static final String EXPERIMENT_IDENTFIER = "EXPERIMENT_IDENTIFIER";
+ public static final String EXPERIMENT_IDENTIFIER = "EXPERIMENT_IDENTIFIER";
public static final String PROJECT = "PROJECT";
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 20dbf2eda98c7ee82dff6cf2707f093c17a7e4dd..b6b76dc840c690a6885f9690a04b1bde9ebe27ea 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,7 @@ import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.SampleGridC
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_IDENTFIER;
+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_INSTANCE_SAMPLE;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.SampleGridColumnIDs.IS_INVALID;
import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.SampleGridColumnIDs.PARENTS;
@@ -78,7 +78,7 @@ public class SampleProvider extends AbstractCommonTableModelProvider<Sample>
builder.addColumn(REGISTRATOR).withDefaultWidth(200);
builder.addColumn(REGISTRATION_DATE).withDefaultWidth(300).hideByDefault();
builder.addColumn(EXPERIMENT);
- builder.addColumn(EXPERIMENT_IDENTFIER).withDefaultWidth(200).hideByDefault();
+ builder.addColumn(EXPERIMENT_IDENTIFIER).withDefaultWidth(200).hideByDefault();
builder.addColumn(PROJECT);
builder.addColumn(PERM_ID).hideByDefault();
builder.addColumn(SHOW_DETAILS_LINK_COLUMN_NAME).hideByDefault();
@@ -98,7 +98,7 @@ public class SampleProvider extends AbstractCommonTableModelProvider<Sample>
builder.column(REGISTRATOR).addPerson(sample.getRegistrator());
builder.column(REGISTRATION_DATE).addDate(sample.getRegistrationDate());
builder.column(EXPERIMENT).addString(getExperimentCode(sample));
- builder.column(EXPERIMENT_IDENTFIER).addString(getExperimentIdentifier(sample));
+ builder.column(EXPERIMENT_IDENTIFIER).addString(getExperimentIdentifier(sample));
builder.column(PROJECT).addString(getProjectCode(sample));
builder.column(PERM_ID).addString(sample.getPermId());
builder.column(SHOW_DETAILS_LINK_COLUMN_NAME).addString(sample.getPermlink());
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 2239cae0f33fd83d0409bee8362751e3f5b3b59a..88106b96707ee0d4b4db9d1640b8cdae67337ee0 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
@@ -16,9 +16,7 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample.columns;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.specific.sample.CommonSampleColDefKind;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.specific.sample.ParentContainerSampleColDef;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.specific.sample.ParentGeneratedFromSampleColDef;
+import ch.systemsx.cisd.openbis.generic.client.web.client.dto.SampleGridColumnIDs;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.RowWithProperties;
import ch.systemsx.cisd.openbis.generic.shared.basic.SimpleYesNoRenderer;
@@ -36,13 +34,13 @@ public class SampleRow extends RowWithProperties
{
super();
this.code = code;
- withCell(CommonSampleColDefKind.CODE, code);
+ withCell(SampleGridColumnIDs.CODE, code);
}
public SampleRow(final String code, final String typeCode)
{
this(code);
- withCell(CommonSampleColDefKind.SAMPLE_TYPE.id(), typeCode);
+ withCell(SampleGridColumnIDs.SAMPLE_TYPE, typeCode);
}
public SampleRow identifier(final String instanceCode)
@@ -52,27 +50,27 @@ public class SampleRow extends RowWithProperties
public SampleRow identifier(final String instanceCode, final String groupCodeOrNull)
{
- withCell(CommonSampleColDefKind.DATABASE_INSTANCE, instanceCode);
+ withCell(SampleGridColumnIDs.DATABASE_INSTANCE, instanceCode);
if (groupCodeOrNull == null)
{
- withCell(CommonSampleColDefKind.GROUP, "");
+ withCell(SampleGridColumnIDs.SPACE, "");
} else
{
- withCell(CommonSampleColDefKind.GROUP, groupCodeOrNull);
+ withCell(SampleGridColumnIDs.SPACE, groupCodeOrNull);
}
groupIdentifier = createGroupIdentifier(instanceCode, groupCodeOrNull);
- withCell(CommonSampleColDefKind.SAMPLE_IDENTIFIER, groupIdentifier + code);
+ withCell(SampleGridColumnIDs.SAMPLE_IDENTIFIER, groupIdentifier + code);
return this;
}
public SampleRow experiment(final String groupCode, final String projectCode,
final String experimentCode)
{
- withCell(CommonSampleColDefKind.PROJECT, projectCode);
- withCell(CommonSampleColDefKind.EXPERIMENT, createLinkString(experimentCode));
+ withCell(SampleGridColumnIDs.PROJECT, projectCode);
+ withCell(SampleGridColumnIDs.EXPERIMENT, createLinkString(experimentCode));
final String experimentIdentifier =
"/" + groupCode + "/" + projectCode + "/" + experimentCode;
- withCell(CommonSampleColDefKind.EXPERIMENT_IDENTIFIER, experimentIdentifier);
+ withCell(SampleGridColumnIDs.EXPERIMENT_IDENTIFIER, experimentIdentifier);
return this;
}
@@ -91,9 +89,9 @@ public class SampleRow extends RowWithProperties
public SampleRow noExperiment()
{
- withCell(CommonSampleColDefKind.PROJECT, null);
- withCell(CommonSampleColDefKind.EXPERIMENT, null);
- withCell(CommonSampleColDefKind.EXPERIMENT_IDENTIFIER, null);
+ withCell(SampleGridColumnIDs.PROJECT, null);
+ withCell(SampleGridColumnIDs.EXPERIMENT, null);
+ withCell(SampleGridColumnIDs.EXPERIMENT_IDENTIFIER, null);
return this;
}
@@ -121,7 +119,7 @@ public class SampleRow extends RowWithProperties
private void withInvalidation(boolean isInvalid)
{
- withCell(CommonSampleColDefKind.IS_INVALID, SimpleYesNoRenderer.render(isInvalid));
+ withCell(SampleGridColumnIDs.IS_INVALID, SimpleYesNoRenderer.render(isInvalid));
}
public SampleRow derivedFromAncestors(final String... ancestorCodes)
@@ -135,20 +133,14 @@ public class SampleRow extends RowWithProperties
private SampleRow derivedFromAncestor(final String ancestorCode)
{
- final String identifier = new ParentGeneratedFromSampleColDef("dummy").getIdentifier();
- withCell(identifier, ancestorCode);
+ withCell(SampleGridColumnIDs.PARENTS, ancestorCode);
return this;
}
public SampleRow partOfContainer(final String containerCode)
{
- final String identifier = new ParentContainerSampleColDef("dummy").getIdentifier();
- withCell(identifier, containerCode);
+ withCell(SampleGridColumnIDs.CONTAINER_SAMPLE, containerCode);
return this;
}
- private final void withCell(final CommonSampleColDefKind columnKind, final String value)
- {
- withCell(columnKind.id(), value);
- }
}