From 968aa2a583ddbdea7f3756041ece7d6fc4f2e06e Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Mon, 4 Jul 2011 09:27:14 +0000
Subject: [PATCH] [LMS-2354] minor refactorization
SVN: 21956
---
.../sample/GenericSampleViewer.java | 16 +---------------
.../sample/SampleDataSetsSection.java | 18 +++++++++++++++---
.../sample/GenericSampleViewerTest.java | 17 +++++++++--------
3 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
index 84e7cce0741..9b944b747c8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
@@ -83,9 +83,6 @@ abstract public class GenericSampleViewer extends AbstractViewerWithVerticalSpli
public static final String PROPERTIES_ID_PREFIX = GenericConstants.ID_PREFIX
+ "generic-sample-properties-viewer_";
- public static final String SHOW_ONLY_DIRECTLY_CONNECTED_CHECKBOX_ID_POSTFIX =
- "-show_only_directly_connected_checkbox";
-
private final IViewContext<?> viewContext;
protected final TechId sampleId;
@@ -209,10 +206,8 @@ abstract public class GenericSampleViewer extends AbstractViewerWithVerticalSpli
parentSamplesSection = new ParentSamplesSection(viewContext, generator);
container.addSection(parentSamplesSection);
// Data Sets
- CheckBox showOnlyDirectlyConnectedCheckBox = createShowOnlyDirectlyConnectedCheckBox();
dataSetSection =
- new SampleDataSetsSection(viewContext, showOnlyDirectlyConnectedCheckBox, sampleId,
- generator.getSampleType());
+ new SampleDataSetsSection(viewContext, sampleId, generator.getSampleType());
container.addSection(dataSetSection);
// Attachments
@@ -237,15 +232,6 @@ abstract public class GenericSampleViewer extends AbstractViewerWithVerticalSpli
return new ArrayList<TabContent>();
}
- private CheckBox createShowOnlyDirectlyConnectedCheckBox()
- {
- CheckBox result = new CheckBox();
- result.setId(getId() + SHOW_ONLY_DIRECTLY_CONNECTED_CHECKBOX_ID_POSTFIX);
- result.setBoxLabel(viewContext.getMessage(Dict.SHOW_ONLY_DIRECTLY_CONNECTED));
- result.setValue(true);
- return result;
- }
-
private AttachmentVersionsSection createAttachmentsSection(final Sample sample)
{
return new AttachmentVersionsSection(viewContext.getCommonViewContext(), sample);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetsSection.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetsSection.java
index 7cc50968982..9618bfd6aca 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetsSection.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetsSection.java
@@ -37,21 +37,33 @@ import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sam
*/
public class SampleDataSetsSection extends AbstractDataSetsSection
{
+ public static final String SHOW_ONLY_DIRECTLY_CONNECTED_CHECKBOX_ID_POSTFIX =
+ "-show_only_directly_connected_checkbox";
+
private final CheckBox showOnlyDirectlyConnectedCheckBox;
private final TechId sampleId;
private final SampleType sampleType;
- public SampleDataSetsSection(final IViewContext<?> viewContext,
- final CheckBox showOnlyDirectlyConnectedCheckBox, TechId sampleId, SampleType sampleType)
+ public SampleDataSetsSection(final IViewContext<?> viewContext, TechId sampleId,
+ SampleType sampleType)
{
super(viewContext.getMessage(Dict.EXTERNAL_DATA_HEADING), viewContext, sampleId);
- this.showOnlyDirectlyConnectedCheckBox = showOnlyDirectlyConnectedCheckBox;
+ this.showOnlyDirectlyConnectedCheckBox = createShowOnlyDirectlyConnectedCheckBox();
this.sampleId = sampleId;
this.sampleType = sampleType;
}
+ private CheckBox createShowOnlyDirectlyConnectedCheckBox()
+ {
+ CheckBox result = new CheckBox();
+ result.setId(getId() + SHOW_ONLY_DIRECTLY_CONNECTED_CHECKBOX_ID_POSTFIX);
+ result.setBoxLabel(viewContext.getMessage(Dict.SHOW_ONLY_DIRECTLY_CONNECTED));
+ result.setValue(true);
+ return result;
+ }
+
@Override
protected void initWidgets(AbstractExternalDataGrid browser)
{
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewerTest.java
index 7eb3cd646d9..373f8310fd0 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewerTest.java
@@ -99,11 +99,11 @@ public class GenericSampleViewerTest extends AbstractGWTTestCase
checkSample.createComponentsTableCheck().expectedSize(2);
final String sampleSubcodeFieldIdent = SampleGridColumnIDs.SUBCODE;
checkComponentsTable.expectedRow(new SampleRow(CONTROL_LAYOUT_EXAMPLE + ":A01", "WELL")
- .identifier("CISD", "CISD").partOfContainer(CONTROL_LAYOUT_EXAMPLE_ID).withCell(
- sampleSubcodeFieldIdent, "A01"));
+ .identifier("CISD", "CISD").partOfContainer(CONTROL_LAYOUT_EXAMPLE_ID)
+ .withCell(sampleSubcodeFieldIdent, "A01"));
checkComponentsTable.expectedRow(new SampleRow(CONTROL_LAYOUT_EXAMPLE + ":A03", "WELL")
- .identifier("CISD", "CISD").partOfContainer(CONTROL_LAYOUT_EXAMPLE_ID).withCell(
- sampleSubcodeFieldIdent, "A03"));
+ .identifier("CISD", "CISD").partOfContainer(CONTROL_LAYOUT_EXAMPLE_ID)
+ .withCell(sampleSubcodeFieldIdent, "A03"));
remoteConsole.prepare(checkComponentsTable);
activateTab(createSectionsTabPanelId(),
@@ -196,7 +196,7 @@ public class GenericSampleViewerTest extends AbstractGWTTestCase
{
String showOnlyDirectlyConnectedCheckBoxId =
GenericSampleViewer.createId(WILDCARD_ID)
- + GenericSampleViewer.SHOW_ONLY_DIRECTLY_CONNECTED_CHECKBOX_ID_POSTFIX;
+ + SampleDataSetsSection.SHOW_ONLY_DIRECTLY_CONNECTED_CHECKBOX_ID_POSTFIX;
GWTTestUtil.clickCheckBoxWithID(showOnlyDirectlyConnectedCheckBoxId);
}
});
@@ -205,9 +205,10 @@ public class GenericSampleViewerTest extends AbstractGWTTestCase
final CheckTableCommand checkIndirectlyConnectedDataTable =
new CheckTableCommand(SampleDataSetBrowser.createGridId(WILDCARD_ID));
checkIndirectlyConnectedDataTable.expectedSize(6);
- checkIndirectlyConnectedDataTable.expectedRow(new DataSetRow(
- DIRECTLY_CONNECTED_DATA_SET_CODE).invalid().withFileFormatType("TIFF").withSample(
- CELL_PLATE_EXAMPLE_ID).withExperiment(CELL_PLATE_EXAMPLE_EXPERIMENT_ID));
+ checkIndirectlyConnectedDataTable
+ .expectedRow(new DataSetRow(DIRECTLY_CONNECTED_DATA_SET_CODE).invalid()
+ .withFileFormatType("TIFF").withSample(CELL_PLATE_EXAMPLE_ID)
+ .withExperiment(CELL_PLATE_EXAMPLE_EXPERIMENT_ID));
checkIndirectlyConnectedDataTable.expectedRow(new DataSetRow(
INDIRECTLY_CONNECTED_DATA_SET_CODE).valid().withLocation("analysis/result")
.withSample("").withExperiment(CELL_PLATE_EXAMPLE_EXPERIMENT_ID));
--
GitLab