Merge branch 'refactor' into 'master' (8a908bbf) · Commits · minerva / core

Commit 8a908bbf authored 8 years ago by Piotr Gawron

Merge branch 'refactor' into 'master'

Refactoring

issues #9, #10, #12

See merge request !3

parents d47a3508 5304f825

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

annotation/src/main/java/lcsb/mapviewer/annotation/services/ModelAnnotator.java 15 additions, 11 deletions

...va/lcsb/mapviewer/annotation/services/ModelAnnotator.java
annotation/src/test/java/lcsb/mapviewer/annotation/services/ModelAnnotatorTest.java 4 additions, 1 deletion

...csb/mapviewer/annotation/services/ModelAnnotatorTest.java
commons/src/test/java/lcsb/mapviewer/common/geometry/AllGeometryTests.java 2 additions, 1 deletion

...java/lcsb/mapviewer/common/geometry/AllGeometryTests.java
console/src/main/java/lcsb/mapviewer/run/BellExport.java 15 additions, 15 deletions

console/src/main/java/lcsb/mapviewer/run/BellExport.java
console/src/main/java/lcsb/mapviewer/run/Statistics.java 7 additions, 5 deletions

console/src/main/java/lcsb/mapviewer/run/Statistics.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/CellDesignerXmlParser.java 119 additions, 131 deletions

...r/converter/model/celldesigner/CellDesignerXmlParser.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/AbstractCellDesignerAliasConverter.java 22 additions, 5 deletions

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

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

...del/celldesigner/geometry/CellDesignerAliasConverter.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/ComplexCellDesignerAliasConverter.java 10 additions, 0 deletions

...ldesigner/geometry/ComplexCellDesignerAliasConverter.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/DegradedCellDesignerAliasConverter.java 10 additions, 0 deletions

...designer/geometry/DegradedCellDesignerAliasConverter.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/DrugCellDesignerAliasConverter.java 12 additions, 1 deletion

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

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

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

...esigner/geometry/PhenotypeCellDesignerAliasConverter.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/ProteinCellDesignerAliasConverter.java 11 additions, 0 deletions

...ldesigner/geometry/ProteinCellDesignerAliasConverter.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/RnaCellDesignerAliasConverter.java 12 additions, 2 deletions

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

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

...ldesigner/geometry/UnknownCellDesignerAliasConverter.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/reaction/ReactionCollectionXmlParser.java 7 additions, 5 deletions

...el/celldesigner/reaction/ReactionCollectionXmlParser.java

with 378 additions and 287 deletions

Please register or to comment