Merge remote-tracking branch 'remotes/origin/master' into 680-auto-clear-comment (c6861dda) · Commits · minerva / core

Commit c6861dda authored 6 years ago by Sascha Herzinger

Merge remote-tracking branch 'remotes/origin/master' into 680-auto-clear-comment

# Conflicts:
#	CHANGELOG

parents f927c359 06db1e3e

No related branches found

No related tags found

1 merge request!631clear previous comment dialog before opening

Pipeline #8658 passed 6 years ago

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 36 additions, 0 deletions

CHANGELOG
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/GeneCellDesignerAliasConverter.java 0 additions, 1 deletion

...celldesigner/geometry/GeneCellDesignerAliasConverter.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/IonCellDesignerAliasConverter.java 0 additions, 1 deletion

.../celldesigner/geometry/IonCellDesignerAliasConverter.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/UnknownCellDesignerAliasConverter.java 0 additions, 2 deletions

...ldesigner/geometry/UnknownCellDesignerAliasConverter.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/reaction/ReactionFromXml.java 2 additions, 3 deletions

...onverter/model/celldesigner/reaction/ReactionFromXml.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/species/RnaXmlParser.java 0 additions, 6 deletions

...er/converter/model/celldesigner/species/RnaXmlParser.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/species/SpeciesSbmlParser.java 3 additions, 0 deletions

...nverter/model/celldesigner/species/SpeciesSbmlParser.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/structure/CellDesignerAntisenseRna.java 0 additions, 1 deletion

...odel/celldesigner/structure/CellDesignerAntisenseRna.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/structure/CellDesignerSpecies.java 3 additions, 0 deletions

...ter/model/celldesigner/structure/CellDesignerSpecies.java
converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/CellDesignerXmlParserTest.java 0 additions, 1 deletion

...nverter/model/celldesigner/CellDesignerXmlParserTest.java
converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/NestedComplexParsingTests.java 86 additions, 73 deletions

...nverter/model/celldesigner/NestedComplexParsingTests.java
converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/alias/SpeciesAliasXmlParserTest.java 0 additions, 1 deletion

...r/model/celldesigner/alias/SpeciesAliasXmlParserTest.java
converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/geometry/ComplexConverterTest.java 0 additions, 2 deletions

...ter/model/celldesigner/geometry/ComplexConverterTest.java
converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/geometry/GeneCellDesignerAliasConverterTest.java 2 additions, 4 deletions

...designer/geometry/GeneCellDesignerAliasConverterTest.java
converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/reaction/ReactionParserTests.java 18 additions, 0 deletions

...rter/model/celldesigner/reaction/ReactionParserTests.java
converter-CellDesigner/testFiles/problematic/problematic_heterodimer_association.xml 319 additions, 0 deletions

...Files/problematic/problematic_heterodimer_association.xml
converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/bioEntity/element/species/SpeciesConverter.java 3 additions, 1 deletion

.../graphics/bioEntity/element/species/SpeciesConverter.java
converter-sbml/src/main/java/lcsb/mapviewer/converter/model/sbml/SbmlBioEntityExporter.java 180 additions, 4 deletions

...mapviewer/converter/model/sbml/SbmlBioEntityExporter.java
converter-sbml/src/main/java/lcsb/mapviewer/converter/model/sbml/SbmlBioEntityParser.java 34 additions, 32 deletions

...b/mapviewer/converter/model/sbml/SbmlBioEntityParser.java
converter-sbml/src/main/java/lcsb/mapviewer/converter/model/sbml/SbmlElementExporter.java 9 additions, 3 deletions

...b/mapviewer/converter/model/sbml/SbmlElementExporter.java

with 695 additions and 135 deletions

Please register or to comment