Skip to content
Snippets Groups Projects
Commit dc0bc8d1 authored by felmer's avatar felmer
Browse files

SE-251 fixed bug concerning experiment identifier in protein details view

SVN: 16222
parent c2251806
No related branches found
No related tags found
No related merge requests found
...@@ -42,7 +42,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget. ...@@ -42,7 +42,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.GWTUtils; import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.GWTUtils;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction; import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction;
import ch.systemsx.cisd.openbis.generic.shared.basic.IAttachmentHolder; import ch.systemsx.cisd.openbis.generic.shared.basic.IAttachmentHolder;
import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolderWithIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.basic.IIdAndCodeHolder; import ch.systemsx.cisd.openbis.generic.shared.basic.IIdAndCodeHolder;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId; import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AttachmentHolderKind; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AttachmentHolderKind;
...@@ -70,6 +69,8 @@ public class GenericExperimentViewer extends AbstractViewer<Experiment> implemen ...@@ -70,6 +69,8 @@ public class GenericExperimentViewer extends AbstractViewer<Experiment> implemen
protected final IIdAndCodeHolder experimentId; protected final IIdAndCodeHolder experimentId;
protected final BasicEntityType experimentType; protected final BasicEntityType experimentType;
protected Experiment experiment;
private ExperimentPropertiesPanel propertiesPanelOrNull; private ExperimentPropertiesPanel propertiesPanelOrNull;
...@@ -123,10 +124,12 @@ public class GenericExperimentViewer extends AbstractViewer<Experiment> implemen ...@@ -123,10 +124,12 @@ public class GenericExperimentViewer extends AbstractViewer<Experiment> implemen
{ {
reloadExperiment(new AbstractAsyncCallback<Experiment>(viewContext) reloadExperiment(new AbstractAsyncCallback<Experiment>(viewContext)
{ {
@Override @Override
protected final void process(final Experiment result) protected final void process(final Experiment result)
{ {
layoutExperimentDetailView(result); experiment = result;
layoutExperimentDetailView();
} }
}); });
} }
...@@ -136,7 +139,7 @@ public class GenericExperimentViewer extends AbstractViewer<Experiment> implemen ...@@ -136,7 +139,7 @@ public class GenericExperimentViewer extends AbstractViewer<Experiment> implemen
viewContext.getService().getExperimentInfo(new TechId(experimentId), callback); viewContext.getService().getExperimentInfo(new TechId(experimentId), callback);
} }
private void layoutExperimentDetailView(final Experiment experiment) private void layoutExperimentDetailView()
{ {
int logId = viewContext.log("layoutExperimentDetailView"); int logId = viewContext.log("layoutExperimentDetailView");
updateOriginalData(experiment); updateOriginalData(experiment);
...@@ -160,7 +163,7 @@ public class GenericExperimentViewer extends AbstractViewer<Experiment> implemen ...@@ -160,7 +163,7 @@ public class GenericExperimentViewer extends AbstractViewer<Experiment> implemen
remove(loadingLabel); remove(loadingLabel);
String displayIdPrefix = getDisplayIdSuffix(experimentType.getCode()); String displayIdPrefix = getDisplayIdSuffix(experimentType.getCode());
GenericExperimentViewer.this.rightPanelSectionsOrNull = GenericExperimentViewer.this.rightPanelSectionsOrNull =
createRightPanel(experiment, displayIdPrefix); createRightPanel(displayIdPrefix);
SectionsPanel rightPanel = layoutSections(rightPanelSectionsOrNull); SectionsPanel rightPanel = layoutSections(rightPanelSectionsOrNull);
moduleSectionManager.initialize(rightPanel, displayIdPrefix, experiment); moduleSectionManager.initialize(rightPanel, displayIdPrefix, experiment);
add(rightPanel, createRightBorderLayoutData()); add(rightPanel, createRightBorderLayoutData());
...@@ -232,8 +235,7 @@ public class GenericExperimentViewer extends AbstractViewer<Experiment> implemen ...@@ -232,8 +235,7 @@ public class GenericExperimentViewer extends AbstractViewer<Experiment> implemen
return GENERIC_EXPERIMENT_VIEWER + "-" + suffix; return GENERIC_EXPERIMENT_VIEWER + "-" + suffix;
} }
private List<DisposableSectionPanel> createRightPanel( private List<DisposableSectionPanel> createRightPanel(final String displayIdSuffix)
IEntityInformationHolderWithIdentifier experiment, final String displayIdSuffix)
{ {
List<DisposableSectionPanel> allPanels = new ArrayList<DisposableSectionPanel>(); List<DisposableSectionPanel> allPanels = new ArrayList<DisposableSectionPanel>();
......
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