BGBM BDI Projects
/
cdmlib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3918359
)
cleanup
author
Andreas Müller
<a.mueller@bgbm.org>
Sun, 28 May 2023 06:55:48 +0000
(08:55 +0200)
committer
Andreas Müller
<a.mueller@bgbm.org>
Sun, 28 May 2023 06:55:48 +0000
(08:55 +0200)
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdm2cdm/Cdm2CdmVocabularyImport.java
patch
|
blob
|
history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeFilterDaoHibernateImpl.java
patch
|
blob
|
history
cdmlib-remote-webapp/src/main/java/eu/etaxonomy/cdm/remote/config/CdmSpringMVCConfigDefault.java
patch
|
blob
|
history
diff --git
a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdm2cdm/Cdm2CdmVocabularyImport.java
b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdm2cdm/Cdm2CdmVocabularyImport.java
index d3eedcd3396f1edbaab9b4adbfd95f26ad13125b..d60341536d82a8df5ce03b7333105026b9ebb28c 100644
(file)
--- a/
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdm2cdm/Cdm2CdmVocabularyImport.java
+++ b/
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdm2cdm/Cdm2CdmVocabularyImport.java
@@
-55,8
+55,7
@@
public class Cdm2CdmVocabularyImport
int count = 0;
//vocabularies
int count = 0;
//vocabularies
- VocabularyFilter vocFilter =
- state.getConfig().getVocabularyFilter();
+ VocabularyFilter vocFilter = state.getConfig().getVocabularyFilter();
for (UUID vocUuid : source.getVocabularyService().uuidList(vocFilter)){
TransactionStatus tx = startTransaction();
doSingleVocabulary(state, vocUuid);
for (UUID vocUuid : source.getVocabularyService().uuidList(vocFilter)){
TransactionStatus tx = startTransaction();
doSingleVocabulary(state, vocUuid);
diff --git
a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeFilterDaoHibernateImpl.java
b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeFilterDaoHibernateImpl.java
index 803a3c8d11c4ef5daba07301f7c0b96ff5d07b97..984ff0a1577772a0144170b7c1c801471f561038 100644
(file)
--- a/
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeFilterDaoHibernateImpl.java
+++ b/
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeFilterDaoHibernateImpl.java
@@
-230,7
+230,6
@@
public class TaxonNodeFilterDaoHibernateImpl
return result;
}
return result;
}
-
private String getSubtreeFilter(TaxonNodeFilter filter) {
String result = "";
List<LogicFilter<TaxonNode>> subtreeFilter = filter.getSubtreeFilter();
private String getSubtreeFilter(TaxonNodeFilter filter) {
String result = "";
List<LogicFilter<TaxonNode>> subtreeFilter = filter.getSubtreeFilter();
diff --git
a/cdmlib-remote-webapp/src/main/java/eu/etaxonomy/cdm/remote/config/CdmSpringMVCConfigDefault.java
b/cdmlib-remote-webapp/src/main/java/eu/etaxonomy/cdm/remote/config/CdmSpringMVCConfigDefault.java
index 179936a383a8d9bb3eb910ac7db0d8b8796a6958..7ce2da86fad844b679aa3545da0f87063ff6419a 100644
(file)
--- a/
cdmlib-remote-webapp/src/main/java/eu/etaxonomy/cdm/remote/config/CdmSpringMVCConfigDefault.java
+++ b/
cdmlib-remote-webapp/src/main/java/eu/etaxonomy/cdm/remote/config/CdmSpringMVCConfigDefault.java
@@
-44,5
+44,4
@@
public class CdmSpringMVCConfigDefault extends CdmSpringMVCConfig {
logger.info(" Spring Configuration Profile: Default");
logger.info(" ==========================================");
}
logger.info(" Spring Configuration Profile: Default");
logger.info(" ==========================================");
}
-
-}
+}
\ No newline at end of file