Skip to content
Snippets Groups Projects
Commit ac35b2dd authored by buczekp's avatar buczekp
Browse files

[LMS-1323] missing commit

SVN: 16500
parent dbbee76b
No related branches found
No related tags found
No related merge requests found
...@@ -31,5 +31,6 @@ ...@@ -31,5 +31,6 @@
<classpathentry kind="lib" path="/libraries/jmock/objenesis/objenesis-1.0.jar"/> <classpathentry kind="lib" path="/libraries/jmock/objenesis/objenesis-1.0.jar"/>
<classpathentry kind="lib" path="/libraries/jmock/jmock.jar"/> <classpathentry kind="lib" path="/libraries/jmock/jmock.jar"/>
<classpathentry kind="lib" path="/libraries/fastutil/fastutil.jar" sourcepath="/libraries/fastutil/fastutil-src.zip"/> <classpathentry kind="lib" path="/libraries/fastutil/fastutil.jar" sourcepath="/libraries/fastutil/fastutil-src.zip"/>
<classpathentry kind="lib" path="/libraries/cisd-common-basic/cisd-common-basic.jar"/>
<classpathentry kind="output" path="targets/www/WEB-INF/classes"/> <classpathentry kind="output" path="targets/www/WEB-INF/classes"/>
</classpath> </classpath>
...@@ -34,6 +34,7 @@ import com.extjs.gxt.ui.client.widget.layout.FitLayout; ...@@ -34,6 +34,7 @@ import com.extjs.gxt.ui.client.widget.layout.FitLayout;
import com.extjs.gxt.ui.client.widget.layout.RowData; import com.extjs.gxt.ui.client.widget.layout.RowData;
import com.extjs.gxt.ui.client.widget.layout.RowLayout; import com.extjs.gxt.ui.client.widget.layout.RowLayout;
import ch.systemsx.cisd.common.shared.basic.utils.StringUtils;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback; import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableSectionPanel; import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableSectionPanel;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants; import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
...@@ -49,7 +50,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.Abstrac ...@@ -49,7 +50,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.Abstrac
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.RowLayoutManager; import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.RowLayoutManager;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.IDisposableComponent; import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.IDisposableComponent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.property.PropertyGrid; import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.property.PropertyGrid;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.StringUtils;
import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolder; import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolder;
import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolderWithIdentifier; 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;
...@@ -175,7 +175,7 @@ public class ProteinViewer extends AbstractViewer<IEntityInformationHolder> impl ...@@ -175,7 +175,7 @@ public class ProteinViewer extends AbstractViewer<IEntityInformationHolder> impl
add(centerPanel, createBorderLayoutData(LayoutRegion.CENTER)); add(centerPanel, createBorderLayoutData(LayoutRegion.CENTER));
rowDataManager.addToContainer(propertyPanel, new RowData(1, 0.5f)); rowDataManager.addToContainer(propertyPanel, new RowData(1, 0.5f));
List<IndistinguishableProteinInfo> indistinguishableProteins = List<IndistinguishableProteinInfo> indistinguishableProteins =
details.getIndistinguishableProteinInfos(); details.getIndistinguishableProteinInfos();
if (indistinguishableProteins.isEmpty() == false) if (indistinguishableProteins.isEmpty() == false)
{ {
List<Peptide> peptides = details.getPeptides(); List<Peptide> peptides = details.getPeptides();
...@@ -189,7 +189,7 @@ public class ProteinViewer extends AbstractViewer<IEntityInformationHolder> impl ...@@ -189,7 +189,7 @@ public class ProteinViewer extends AbstractViewer<IEntityInformationHolder> impl
layout(); layout();
} }
} }
private ContentPanel createIndistinguishableProteinsSection( private ContentPanel createIndistinguishableProteinsSection(
List<IndistinguishableProteinInfo> indistinguishableProteins, List<Peptide> peptides) List<IndistinguishableProteinInfo> indistinguishableProteins, List<Peptide> peptides)
{ {
...@@ -209,8 +209,7 @@ public class ProteinViewer extends AbstractViewer<IEntityInformationHolder> impl ...@@ -209,8 +209,7 @@ public class ProteinViewer extends AbstractViewer<IEntityInformationHolder> impl
properties.put(viewContext.getMessage(Dict.ACCESSION_NUMBER), info); properties.put(viewContext.getMessage(Dict.ACCESSION_NUMBER), info);
propertyGrid.registerPropertyValueRenderer(IndistinguishableProteinInfo.class, propertyGrid.registerPropertyValueRenderer(IndistinguishableProteinInfo.class,
PropertyValueRenderers.createProteinIdentLinkRenderer(viewContext)); PropertyValueRenderers.createProteinIdentLinkRenderer(viewContext));
properties.put(viewContext.getMessage(Dict.PROTEIN_DESCRIPTION), info properties.put(viewContext.getMessage(Dict.PROTEIN_DESCRIPTION), info.getDescription());
.getDescription());
String markedSequence = markPeptides(info.getSequence(), peptides); String markedSequence = markPeptides(info.getSequence(), peptides);
properties.put(viewContext.getMessage(Dict.SEQUENCE_NAME), markedSequence); properties.put(viewContext.getMessage(Dict.SEQUENCE_NAME), markedSequence);
properties.put(viewContext.getMessage(Dict.COVERAGE), info.getCoverage()); properties.put(viewContext.getMessage(Dict.COVERAGE), info.getCoverage());
...@@ -225,7 +224,7 @@ public class ProteinViewer extends AbstractViewer<IEntityInformationHolder> impl ...@@ -225,7 +224,7 @@ public class ProteinViewer extends AbstractViewer<IEntityInformationHolder> impl
panel.add(tabPanel, new RowData(1, 1)); panel.add(tabPanel, new RowData(1, 1));
return panel; return panel;
} }
private void recreateUIWithDatasetTable(ProteinByExperiment protein, ContentPanel propertyPanel) private void recreateUIWithDatasetTable(ProteinByExperiment protein, ContentPanel propertyPanel)
{ {
BorderLayoutData layoutData = createBorderLayoutData(LayoutRegion.WEST); BorderLayoutData layoutData = createBorderLayoutData(LayoutRegion.WEST);
...@@ -301,7 +300,7 @@ public class ProteinViewer extends AbstractViewer<IEntityInformationHolder> impl ...@@ -301,7 +300,7 @@ public class ProteinViewer extends AbstractViewer<IEntityInformationHolder> impl
String markedSequence = String markedSequence =
markPeptides(proteinDetails.getSequence(), proteinDetails.getPeptides()); markPeptides(proteinDetails.getSequence(), proteinDetails.getPeptides());
properties.put(viewContext.getMessage(Dict.SEQUENCE_NAME), markedSequence); properties.put(viewContext.getMessage(Dict.SEQUENCE_NAME), markedSequence);
properties.put(viewContext.getMessage(Dict.COVERAGE), proteinDetails.getCoverage()); properties.put(viewContext.getMessage(Dict.COVERAGE), proteinDetails.getCoverage());
propertyGrid.registerPropertyValueRenderer(Peptide.class, PropertyValueRenderers propertyGrid.registerPropertyValueRenderer(Peptide.class, PropertyValueRenderers
......
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