Merge branch 'master' into genomics
Conflicts: annotation/src/main/java/lcsb/mapviewer/annotation/cache/WebPageDownloader.java service/src/test/java/lcsb/mapviewer/services/utils/graph/AllGraphTests.java
No related branches found
No related tags found
Showing
- annotation/src/main/java/lcsb/mapviewer/annotation/cache/WebPageDownloader.java 10 additions, 3 deletions...va/lcsb/mapviewer/annotation/cache/WebPageDownloader.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/EntrezAnnotator.java 8 additions, 5 deletions...iewer/annotation/services/annotators/EntrezAnnotator.java
- annotation/src/main/java/lcsb/mapviewer/annotation/services/annotators/UniprotAnnotator.java 3 additions, 0 deletions...ewer/annotation/services/annotators/UniprotAnnotator.java
- annotation/src/test/java/lcsb/mapviewer/annotation/services/ChEMBLParserTest.java 1 addition, 0 deletions.../lcsb/mapviewer/annotation/services/ChEMBLParserTest.java
- annotation/src/test/java/lcsb/mapviewer/annotation/services/annotators/EnsemblAnnotatorTest.java 1 addition, 2 deletions.../annotation/services/annotators/EnsemblAnnotatorTest.java
- model/src/main/java/lcsb/mapviewer/model/map/species/Element.java 37 additions, 1 deletion...c/main/java/lcsb/mapviewer/model/map/species/Element.java
- persist/src/main/java/lcsb/mapviewer/persist/dao/map/graph/DataMiningDao.java 0 additions, 55 deletions...a/lcsb/mapviewer/persist/dao/map/graph/DataMiningDao.java
- persist/src/main/resources/applicationContext-persist.xml 0 additions, 1 deletionpersist/src/main/resources/applicationContext-persist.xml
- persist/src/test/java/lcsb/mapviewer/persist/dao/map/graph/AllGraphTests.java 1 addition, 2 deletions...a/lcsb/mapviewer/persist/dao/map/graph/AllGraphTests.java
- persist/src/test/java/lcsb/mapviewer/persist/dao/map/graph/DataMiningDaoTest.java 0 additions, 74 deletions...sb/mapviewer/persist/dao/map/graph/DataMiningDaoTest.java
- service/src/main/java/lcsb/mapviewer/services/impl/DataMiningService.java 0 additions, 116 deletions.../java/lcsb/mapviewer/services/impl/DataMiningService.java
- service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java 2 additions, 30 deletions...ain/java/lcsb/mapviewer/services/impl/ProjectService.java
- service/src/main/java/lcsb/mapviewer/services/interfaces/IDataMiningService.java 0 additions, 66 deletions...csb/mapviewer/services/interfaces/IDataMiningService.java
- service/src/main/java/lcsb/mapviewer/services/search/data/FullAliasViewFactory.java 5 additions, 1 deletion.../mapviewer/services/search/data/FullAliasViewFactory.java
- service/src/test/java/lcsb/mapviewer/services/ServiceTestFunctions.java 0 additions, 4 deletions...st/java/lcsb/mapviewer/services/ServiceTestFunctions.java
- service/src/test/java/lcsb/mapviewer/services/impl/AllImplServiceTests.java 0 additions, 1 deletion...ava/lcsb/mapviewer/services/impl/AllImplServiceTests.java
- service/src/test/java/lcsb/mapviewer/services/impl/DataMiningServiceTest.java 0 additions, 98 deletions...a/lcsb/mapviewer/services/impl/DataMiningServiceTest.java
- service/src/test/java/lcsb/mapviewer/services/impl/LogServiceTest.java 0 additions, 134 deletions...est/java/lcsb/mapviewer/services/impl/LogServiceTest.java
- service/src/test/java/lcsb/mapviewer/services/impl/ProjectServiceTest.java 1 addition, 1 deletion...java/lcsb/mapviewer/services/impl/ProjectServiceTest.java
Loading
Please register or sign in to comment