Merge branch 'master' into pdb-annotation
# Conflicts: # rest-api/src/main/java/lcsb/mapviewer/api/projects/models/bioEntities/elements/ElementsRestImpl.java
No related branches found
No related tags found
Showing
- .settings/org.eclipse.core.resources.prefs 0 additions, 2 deletions.settings/org.eclipse.core.resources.prefs
- CellDesigner-plugin/src/main/resources/empty.txt 1 addition, 0 deletionsCellDesigner-plugin/src/main/resources/empty.txt
- README.md 10 additions, 0 deletionsREADME.md
- annotation/src/main/java/lcsb/mapviewer/annotation/data/Drug.java 6 additions, 2 deletions...on/src/main/java/lcsb/mapviewer/annotation/data/Drug.java
- annotation/src/main/java/lcsb/mapviewer/annotation/services/ChEMBLParser.java 21 additions, 35 deletions...java/lcsb/mapviewer/annotation/services/ChEMBLParser.java
- annotation/src/main/java/lcsb/mapviewer/annotation/services/ChemicalParser.java 7 additions, 2 deletions...va/lcsb/mapviewer/annotation/services/ChemicalParser.java
- annotation/src/main/java/lcsb/mapviewer/annotation/services/DrugAnnotation.java 94 additions, 4 deletions...va/lcsb/mapviewer/annotation/services/DrugAnnotation.java
- annotation/src/main/java/lcsb/mapviewer/annotation/services/DrugbankHTMLParser.java 179 additions, 100 deletions...csb/mapviewer/annotation/services/DrugbankHTMLParser.java
- annotation/src/main/java/lcsb/mapviewer/annotation/services/annotators/ElementAnnotator.java 13 additions, 12 deletions...ewer/annotation/services/annotators/ElementAnnotator.java
- annotation/src/main/java/lcsb/mapviewer/annotation/services/annotators/EnsemblAnnotator.java 1 addition, 1 deletion...ewer/annotation/services/annotators/EnsemblAnnotator.java
- annotation/src/main/java/lcsb/mapviewer/annotation/services/annotators/GoAnnotator.java 1 addition, 1 deletion...mapviewer/annotation/services/annotators/GoAnnotator.java
- annotation/src/test/java/lcsb/mapviewer/annotation/services/ChEMBLParserTest.java 28 additions, 0 deletions.../lcsb/mapviewer/annotation/services/ChEMBLParserTest.java
- annotation/src/test/java/lcsb/mapviewer/annotation/services/DrugAnnotationTest.java 2 additions, 1 deletion...csb/mapviewer/annotation/services/DrugAnnotationTest.java
- annotation/src/test/java/lcsb/mapviewer/annotation/services/DrugbankHTMLParserTest.java 105 additions, 21 deletions...mapviewer/annotation/services/DrugbankHTMLParserTest.java
- annotation/src/test/java/lcsb/mapviewer/annotation/services/annotators/ElementAnnotatorTest.java 8 additions, 0 deletions.../annotation/services/annotators/ElementAnnotatorTest.java
- annotation/testFiles/drugbank/target-html-part.html 1 addition, 0 deletionsannotation/testFiles/drugbank/target-html-part.html
- commons/src/main/java/lcsb/mapviewer/common/XmlParser.java 4 additions, 1 deletioncommons/src/main/java/lcsb/mapviewer/common/XmlParser.java
- commons/src/main/java/lcsb/mapviewer/common/geometry/ColorParser.java 15 additions, 0 deletions...main/java/lcsb/mapviewer/common/geometry/ColorParser.java
- converter-CellDesigner/src/main/resources/empty.txt 1 addition, 0 deletionsconverter-CellDesigner/src/main/resources/empty.txt
- converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/AbstractImageGenerator.java 25 additions, 2 deletions.../mapviewer/converter/graphics/AbstractImageGenerator.java
Loading
Please register or sign in to comment