private static final long serialVersionUID = 1344722304369624443L;
private static final Logger logger = LogManager.getLogger();
- //quick and dirty
- private Cdm2CdmImportState stateX;
-
protected ICdmApplication sourceRepo(Cdm2CdmImportState state){
ICdmApplication repo = state.getSourceRepository();
if (repo == null){
extends OrderedTermBase<T> {
private static final long serialVersionUID = 5497187985269083971L;
@SuppressWarnings("unused")
- private static final Logger logger = LogManager.getLogger(RelationshipTermBase.class);
+ private static final Logger logger = LogManager.getLogger();
@XmlElement(name = "Symmetrical")
@Field(analyze = Analyze.NO)
private static final long serialVersionUID = -7977901140330659208L;
@SuppressWarnings("unused")
- private static final Logger logger = LogManager.getLogger(NamedAreaLevel.class);
+ private static final Logger logger = LogManager.getLogger();
protected static Map<UUID, NamedAreaLevel> termMap = null;
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.cdm.model.name;
import java.util.HashMap;
protected static Map<UUID, OrderedTerm> termMap = null;
-
protected static OrderedTerm getTermByUuid(UUID uuid){
if (termMap == null || termMap.isEmpty()){
return getTermByClassAndUUID(OrderedTerm.class, uuid);
}
}
-
public static OrderedTerm NewInstance(TermType termType, String description, String label, String labelAbbrev){
return new OrderedTerm(termType, description, label, labelAbbrev);
}
-
public static OrderedTerm NewDnaQualityInstance(String description, String label, String labelAbbrev){
return new OrderedTerm(TermType.DnaQualityType, description, label, labelAbbrev);
}
-
//******************* CONSTRUCTOR ***********************************/
//for hibernate use only, *packet* private required by bytebuddy
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.cdm.model.term;
import java.util.UUID;
* @param vocType VocabularyEnum
* @param voc vocabulary
* @param missingTerms Set of UUIDs for terms to be loaded.
- * @return
*/
public <T extends DefinedTermBase<T>, S extends OrderedTermBase<S>> Set<T> loadSingleTerms(VocabularyEnum vocType, TermVocabulary<T> voc,
Set<UUID> missingTerms);
-
-
-
}
String[] csvLine, Map<UUID,DefinedTermBase> terms, Class<T> termClass,
TermVocabulary<T> voc, boolean abbrevAsId, S lastTerm,
T classDefiningTermInstance) {
+
T term = classDefiningTermInstance.readCsvLine(termClass, arrayedLine(csvLine), voc.getTermType(), terms, abbrevAsId);
terms.put(term.getUuid(), term);
if (voc.isInstanceOf(OrderedTermVocabulary.class) && term.isInstanceOf(OrderedTermBase.class)){
}
}
-
@Override
public <T extends DefinedTermBase<T>,S extends OrderedTermBase<S>> Set<T> loadSingleTerms(VocabularyEnum vocType,
TermVocabulary<T> voc, Set<UUID> missingTerms) {
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
*/
public class TaxonNameTest extends EntityTestBase {
- private static final Logger logger = LogManager.getLogger(TaxonNameTest.class);
+ private static final Logger logger = LogManager.getLogger();
private TaxonName nameBase1;
private TaxonName nameBase2;
public class OrderedTermBaseTest extends EntityTestBase {
@SuppressWarnings("unused")
- private static final Logger logger = LogManager.getLogger(OrderedTermBaseTest.class);
+ private static final Logger logger = LogManager.getLogger();
private OrderedTermBase otb1;
private OrderedTermBase otb2;
import java.util.List;
import java.util.Map;
-import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.database.ICdmDataSource;
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.cdm.persistence.dao.hibernate.term;
import org.springframework.stereotype.Repository;
extends CdmEntityDaoBase<OrderedTermVocabulary<OrderedTermBase<?>>>
implements IOrderedTermVocabularyDao {
- /**
- * @param type
- */
public OrderedTermVocabularyDaoImpl() {
super((Class)OrderedTermVocabulary.class);
}
-}
+}
\ No newline at end of file
import eu.etaxonomy.cdm.model.media.Media;
import eu.etaxonomy.cdm.model.metadata.TermSearchField;
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
-import eu.etaxonomy.cdm.model.term.OrderedTermBase;
import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary;
import eu.etaxonomy.cdm.model.term.Representation;
import eu.etaxonomy.cdm.model.term.TermType;
/**
* Returns a term according to it's uri
- * @param uri
- * @return
*/
public DefinedTermBase getByUri(URI uri);
import java.util.HashSet;
import java.util.Set;
-import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import eu.etaxonomy.cdm.common.SetMap;
import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.cdm.model.location.NamedArea;
import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
-import eu.etaxonomy.cdm.model.term.OrderedTermBase;
import eu.etaxonomy.cdm.persistence.dao.term.IDefinedTermDao;
/**
*/
public class DistributionAggregationTest extends CdmTransactionalIntegrationTest {
- private static Logger logger = LogManager.getLogger(DistributionAggregationTest.class);
+ private static Logger logger = LogManager.getLogger();
private static final UUID T_LAPSANA_UUID = UUID.fromString("f65d47bd-4f49-4ab1-bc4a-bc4551eaa1a8");
BGBM BDI Projects / cdmlib.git / commitdiff