Merge branch 'master' into 'devel_12.0.x' (430db2ef) · Commits · minerva / core

There was a problem fetching the pipeline metadata.

Commit 430db2ef authored 6 years ago by Piotr Gawron

Merge branch 'master' into 'devel_12.0.x'

# Conflicts:
#   frontend-js/src/main/js/map/canvas/Point.js

parents d5be0663 ad49683b

No related branches found

No related tags found

1 merge request!35712.0.1 into master

Pipeline #

Expand all Hide whitespace changes

Inline Side-by-side

Showing

annotation/src/main/java/lcsb/mapviewer/annotation/services/ChemicalParser.java 4 additions, 0 deletions

...va/lcsb/mapviewer/annotation/services/ChemicalParser.java
annotation/src/main/java/lcsb/mapviewer/annotation/services/annotators/HgncAnnotator.java 43 additions, 41 deletions

...pviewer/annotation/services/annotators/HgncAnnotator.java
annotation/src/main/java/lcsb/mapviewer/annotation/services/genome/ReferenceGenomeConnector.java 2 additions, 2 deletions

.../annotation/services/genome/ReferenceGenomeConnector.java
annotation/src/main/java/lcsb/mapviewer/annotation/services/genome/UcscReferenceGenomeConnector.java 428 additions, 424 deletions

...otation/services/genome/UcscReferenceGenomeConnector.java
annotation/src/test/java/lcsb/mapviewer/annotation/services/annotators/HgncAnnotatorTest.java 533 additions, 509 deletions

...wer/annotation/services/annotators/HgncAnnotatorTest.java
annotation/src/test/java/lcsb/mapviewer/annotation/services/genome/UcscReferenceGenomeConnectorTest.java 922 additions, 917 deletions

...ion/services/genome/UcscReferenceGenomeConnectorTest.java
commons/src/main/java/lcsb/mapviewer/common/comparator/StringSetComparator.java 48 additions, 48 deletions

...lcsb/mapviewer/common/comparator/StringSetComparator.java
commons/src/main/java/lcsb/mapviewer/common/geometry/LineTransformation.java 199 additions, 199 deletions

...va/lcsb/mapviewer/common/geometry/LineTransformation.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/CellDesignerElementCollection.java 211 additions, 213 deletions

...ter/model/celldesigner/CellDesignerElementCollection.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/alias/SpeciesAliasXmlParser.java 255 additions, 252 deletions

...erter/model/celldesigner/alias/SpeciesAliasXmlParser.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/AbstractCellDesignerAliasConverter.java 425 additions, 235 deletions

...designer/geometry/AbstractCellDesignerAliasConverter.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/AntisenseRnaCellDesignerAliasConverter.java 146 additions, 115 deletions

...gner/geometry/AntisenseRnaCellDesignerAliasConverter.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/CellDesignerAliasConverter.java 153 additions, 114 deletions

...del/celldesigner/geometry/CellDesignerAliasConverter.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/GeneCellDesignerAliasConverter.java 120 additions, 81 deletions

...celldesigner/geometry/GeneCellDesignerAliasConverter.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/ICellDesignerAliasConverter.java 96 additions, 61 deletions

...el/celldesigner/geometry/ICellDesignerAliasConverter.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/IonCellDesignerAliasConverter.java 101 additions, 82 deletions

.../celldesigner/geometry/IonCellDesignerAliasConverter.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/RnaCellDesignerAliasConverter.java 150 additions, 118 deletions

.../celldesigner/geometry/RnaCellDesignerAliasConverter.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/SimpleMoleculeCellDesignerAliasConverter.java 62 additions, 43 deletions

...er/geometry/SimpleMoleculeCellDesignerAliasConverter.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/UnknownCellDesignerAliasConverter.java 73 additions, 54 deletions

...ldesigner/geometry/UnknownCellDesignerAliasConverter.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/species/AntisenseRnaXmlParser.java 165 additions, 149 deletions

...ter/model/celldesigner/species/AntisenseRnaXmlParser.java

with 4136 additions and 3657 deletions

Please register or to comment