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:
21f31bf
)
minor
author
Andreas Müller
<a.mueller@bgbm.org>
Wed, 20 May 2009 10:16:09 +0000
(10:16 +0000)
committer
Andreas Müller
<a.mueller@bgbm.org>
Wed, 20 May 2009 10:16:09 +0000
(10:16 +0000)
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agent/AgentDaoImpl.java
patch
|
blob
|
history
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java
patch
|
blob
|
history
diff --git
a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agent/AgentDaoImpl.java
b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agent/AgentDaoImpl.java
index 807a6efc0e05138de8c6e6fcdc6ade91b10fbefd..de53b5d0e11608955e353e227650fa6e082a6fd9 100644
(file)
--- a/
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agent/AgentDaoImpl.java
+++ b/
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agent/AgentDaoImpl.java
@@
-17,9
+17,7
@@
import org.apache.lucene.analysis.SimpleAnalyzer;
import org.apache.lucene.queryParser.ParseException;
\r
import org.apache.lucene.queryParser.QueryParser;
\r
import org.hibernate.Criteria;
\r
import org.apache.lucene.queryParser.ParseException;
\r
import org.apache.lucene.queryParser.QueryParser;
\r
import org.hibernate.Criteria;
\r
-import org.hibernate.Hibernate;
\r
import org.hibernate.Query;
\r
import org.hibernate.Query;
\r
-import org.hibernate.criterion.Order;
\r
import org.hibernate.criterion.Restrictions;
\r
import org.hibernate.envers.query.AuditEntity;
\r
import org.hibernate.envers.query.AuditQuery;
\r
import org.hibernate.criterion.Restrictions;
\r
import org.hibernate.envers.query.AuditEntity;
\r
import org.hibernate.envers.query.AuditQuery;
\r
@@
-34,7
+32,6
@@
import eu.etaxonomy.cdm.model.agent.Institution;
import eu.etaxonomy.cdm.model.agent.InstitutionalMembership;
\r
import eu.etaxonomy.cdm.model.agent.Person;
\r
import eu.etaxonomy.cdm.model.agent.Team;
\r
import eu.etaxonomy.cdm.model.agent.InstitutionalMembership;
\r
import eu.etaxonomy.cdm.model.agent.Person;
\r
import eu.etaxonomy.cdm.model.agent.Team;
\r
-import eu.etaxonomy.cdm.model.taxon.TaxonBase;
\r
import eu.etaxonomy.cdm.model.view.AuditEvent;
\r
import eu.etaxonomy.cdm.persistence.dao.QueryParseException;
\r
import eu.etaxonomy.cdm.persistence.dao.agent.IAgentDao;
\r
import eu.etaxonomy.cdm.model.view.AuditEvent;
\r
import eu.etaxonomy.cdm.persistence.dao.QueryParseException;
\r
import eu.etaxonomy.cdm.persistence.dao.agent.IAgentDao;
\r
diff --git
a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java
b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java
index b33fc05e9c8ce6580d28310a4adab8502dfb2697..442cda03eddc33057cbac9b42ca0b93377da9355 100644
(file)
--- a/
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java
+++ b/
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java
@@
-45,7
+45,7
@@
public class TaxonGenerator {
basionym.setTitleCache("Hieracilla DC.");
basionym.setGenusOrUninomial("Hieracilla");
basionym.setCombinationAuthorTeam(deCandolle);
basionym.setTitleCache("Hieracilla DC.");
basionym.setGenusOrUninomial("Hieracilla");
basionym.setCombinationAuthorTeam(deCandolle);
- botName.addBasionym(basionym, "216");
+ botName.addBasionym(basionym,
null, null,
"216");
//species taxon that is the child of genus taxon
BotanicalName botSpecies = BotanicalName.NewInstance(Rank.SPECIES());
//species taxon that is the child of genus taxon
BotanicalName botSpecies = BotanicalName.NewInstance(Rank.SPECIES());