import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
import eu.etaxonomy.cdm.model.name.NonViralName;
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
taxon = Taxon.NewInstance(null, null);
- concept = Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
+ concept = Taxon.NewInstance(TaxonNameFactory.NewNonViralInstance(null), null);
homotypicalGroup = HomotypicalGroup.NewInstance();
concept.addTaxonRelation(taxon, TaxonRelationshipType.MISAPPLIED_NAME_FOR(), null, null);
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
import eu.etaxonomy.cdm.model.name.NonViralName;
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.taxeditor.editor.name.operation.ChangeHomotypicGroupOperation;
public static void setUpBeforeClass() throws Exception {
taxon = Taxon.NewInstance(null, null);
- synonym = Synonym.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
+ synonym = Synonym.NewInstance(TaxonNameFactory.NewNonViralInstance(null), null);
oldHomotypicalGroup = HomotypicalGroup.NewInstance();
oldHomotypicalGroup.addTypifiedName(synonym.getName());
import eu.etaxonomy.cdm.model.common.ICdmBase;
import eu.etaxonomy.cdm.model.name.NonViralName;
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.SynonymType;
import eu.etaxonomy.cdm.model.taxon.Taxon;
public static void setUpBeforeClass() throws Exception {
taxon = Taxon.NewInstance(null, null);
- synonym = Synonym.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
+ synonym = Synonym.NewInstance(TaxonNameFactory.NewNonViralInstance(null), null);
taxonRelationshipType = TaxonRelationshipType.CONTRADICTION();
taxon.addSynonym(synonym, SynonymType.SYNONYM_OF());
import eu.etaxonomy.cdm.model.common.ICdmBase;
import eu.etaxonomy.cdm.model.name.NonViralName;
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.SynonymType;
import eu.etaxonomy.cdm.model.taxon.Taxon;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
taxon = Taxon.NewInstance(null, null);
- synonym = Synonym.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
+ synonym = Synonym.NewInstance(TaxonNameFactory.NewNonViralInstance(null), null);
synonymType = SynonymType.SYNONYM_OF();
taxon.addSynonym(synonym, synonymType);
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
import eu.etaxonomy.cdm.model.name.NonViralName;
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
import eu.etaxonomy.cdm.model.taxon.SynonymType;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.taxeditor.store.operations.AbstractTaxeditorOperationTestBase;
@Before
public void setUp() throws Exception {
- taxonName = TaxonNameBase.NewNonViralInstance(null);
+ taxonName = TaxonNameFactory.NewNonViralInstance(null);
taxon = Taxon.NewInstance(taxonName, null);
homotypicalGroup = HomotypicalGroup.NewInstance();
- newSynonymName = TaxonNameBase.NewNonViralInstance(null);
+ newSynonymName = TaxonNameFactory.NewNonViralInstance(null);
operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
undoContext, taxon, homotypicalGroup, newSynonymName, postOperation);
import eu.etaxonomy.cdm.model.name.NonViralName;
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.taxeditor.editor.name.operation.CreateSynonymInNewGroupOperation;
import eu.etaxonomy.taxeditor.store.operations.AbstractTaxeditorOperationTestBase;
public static void setUpBeforeClass() throws Exception {
taxon = Taxon.NewInstance(null, null);
- newSynonymName = TaxonNameBase.NewNonViralInstance(null);
+ newSynonymName = TaxonNameFactory.NewNonViralInstance(null);
operation = new CreateSynonymInNewGroupOperation("Create Synonyma In New Group", undoContext, taxon, newSynonymName, postOperation);
}
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
import eu.etaxonomy.cdm.model.name.NonViralName;
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.SynonymType;
import eu.etaxonomy.cdm.model.taxon.Taxon;
(new DefaultTermInitializer()).initialize();
// Create the original accepted taxon
- oldTaxonName = TaxonNameBase.NewNonViralInstance(null);
+ oldTaxonName = TaxonNameFactory.NewNonViralInstance(null);
taxon = Taxon.NewInstance(oldTaxonName, null);
// // Create its parent taxon
// childTaxon.setTaxonomicParent(taxon, null, null);
// Create a homotypic synonym for the accepted taxon
- taxon.addHomotypicSynonymName(TaxonNameBase.NewNonViralInstance(null));
+ taxon.addHomotypicSynonymName(TaxonNameFactory.NewNonViralInstance(null));
// homotypicSynonym = Synonym.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
// HomotypicalGroup acceptedHomotypicalGroup = HomotypicalGroup.NewInstance();
// acceptedHomotypicalGroup.addTypifiedName(oldTaxon.getName());
// acceptedHomotypicalGroup.addTypifiedName(homotypicSynonym.getName());
// Create a heterotypic synonym that will be used to create the new accepted taxon
- oldSynonymName = TaxonNameBase.NewNonViralInstance(null);
+ oldSynonymName = TaxonNameFactory.NewNonViralInstance(null);
oldHeterotypicSynonym = Synonym.NewInstance(oldSynonymName, null);
// oldTaxon.addS .addHeterotypicSynonym(oldHeterotypicSynonym, null, null);
heteroypicalGroup = HomotypicalGroup.NewInstance();
taxon.addSynonym(oldHeterotypicSynonym, SynonymType.HETEROTYPIC_SYNONYM_OF());
// Create a misapplication
- misapplication = Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
+ misapplication = Taxon.NewInstance(TaxonNameFactory.NewNonViralInstance(null), null);
taxon.addMisappliedName(misapplication, null, null);
// Create a concept relation
- concept = Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
+ concept = Taxon.NewInstance(TaxonNameFactory.NewNonViralInstance(null), null);
conceptRelationshipType = TaxonRelationshipType.CONGRUENT_TO();
concept.addTaxonRelation(taxon, conceptRelationshipType, null, null);
import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
import eu.etaxonomy.cdm.model.name.NonViralName;
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
import eu.etaxonomy.cdm.model.name.ZoologicalName;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
import eu.etaxonomy.taxeditor.store.CdmStore;
protected NonViralName createNewEntity() {
NomenclaturalCode code = PreferencesUtil.getPreferredNomenclaturalCode();
if(code.equals(NomenclaturalCode.ICNAFP )){
- return TaxonNameBase.NewBotanicalInstance(null);
+ return TaxonNameFactory.NewBotanicalInstance(null);
}else if(code.equals(NomenclaturalCode.ICZN)){
- return TaxonNameBase.NewZoologicalInstance(null);
+ return TaxonNameFactory.NewZoologicalInstance(null);
}
return null;
}
import eu.etaxonomy.cdm.api.service.ITaxonService;
import eu.etaxonomy.cdm.model.name.NonViralName;
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.ui.section.name.NonViralNameWizardPage;
/** {@inheritDoc} */
@Override
protected Taxon createNewEntity() {
- return Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
+ return Taxon.NewInstance(TaxonNameFactory.NewNonViralInstance(null), null);
}
/** {@inheritDoc} */
import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
import eu.etaxonomy.cdm.model.name.NonViralName;
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
import eu.etaxonomy.cdm.model.name.ZoologicalName;
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
@Override
public void updateContent() {
if (getEntity() == null) {
- setEntity(TaxonNameBase.NewNonViralInstance(null));
+ setEntity(TaxonNameFactory.NewNonViralInstance(null));
}
super.updateContent();
import eu.etaxonomy.cdm.model.name.NonViralName;
import eu.etaxonomy.cdm.model.name.Rank;
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
import eu.etaxonomy.cdm.model.name.ZoologicalName;
import eu.etaxonomy.cdm.strategy.parser.ParserProblem;
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
@Override
protected void updateContent() {
if(getEntity() == null){
- setEntity(TaxonNameBase.NewNonViralInstance(null));
+ setEntity(TaxonNameFactory.NewNonViralInstance(null));
}
super.updateContent();
import eu.etaxonomy.cdm.model.name.NonViralName;
import eu.etaxonomy.cdm.model.name.Rank;
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
/**
* @author n.hoffmann
(new DefaultTermInitializer()).initialize();
- name = TaxonNameBase.NewNonViralInstance(Rank.SPECIES());
+ name = TaxonNameFactory.NewNonViralInstance(Rank.SPECIES());
name.setGenusOrUninomial("Joe");
name.setSpecificEpithet("mama");
import eu.etaxonomy.cdm.model.name.BotanicalName;
import eu.etaxonomy.cdm.model.name.NonViralName;
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
import eu.etaxonomy.cdm.model.taxon.Classification;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
public void testCDMEntitySaveLazyNew() {
Team combAuthor = Team.NewInstance();
combAuthor.addTeamMember(Person.NewTitledInstance("test member"));
- BotanicalName name = TaxonNameBase.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
+ BotanicalName name = TaxonNameFactory.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
name.setCombinationAuthorship(combAuthor);
Taxon tax1 = Taxon.NewInstance(name, null);
UUID taxonUuid1 = taxonService.save(tax1).getUuid();
import eu.etaxonomy.cdm.model.name.BotanicalName;
import eu.etaxonomy.cdm.model.name.NonViralName;
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
Team combAuthor = Team.NewInstance();
combAuthor.addTeamMember(Person.NewTitledInstance("test member"));
- BotanicalName name = TaxonNameBase.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
+ BotanicalName name = TaxonNameFactory.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
name.setCombinationAuthorship(combAuthor);
Taxon taxon = Taxon.NewInstance(name, null);
UUID taxonUuid = taxonService.save(taxon).getUuid();
public void testCDMEntitySaveLazyNew() {
Team combAuthor = Team.NewInstance();
combAuthor.addTeamMember(Person.NewTitledInstance("test member"));
- BotanicalName name = TaxonNameBase.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
+ BotanicalName name = TaxonNameFactory.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
name.setCombinationAuthorship(combAuthor);
Taxon tax1 = Taxon.NewInstance(name, null);
UUID taxonUuid1 = taxonService.save(tax1).getUuid();
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
import eu.etaxonomy.cdm.model.name.NonViralName;
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
TaxonNode taxonNode = taxonNodeService.load(taxonNodeUuid);
Taxon taxon = taxonNode.getTaxon();
HomotypicalGroup group = taxon.getHomotypicGroup();
- BotanicalName newSynonymName = TaxonNameBase.NewBotanicalInstance(null);
+ BotanicalName newSynonymName = TaxonNameFactory.NewBotanicalInstance(null);
newSynonymName.setTitleCache("New Synonym", true);
operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
undoContext, taxon, group, newSynonymName, postOperation);
TaxonNode taxonNode = taxonNodeService.load(taxonNodeUuid);
Taxon taxon = taxonNode.getTaxon();
HomotypicalGroup group = taxon.getHomotypicGroup();
- BotanicalName newSynonymName = TaxonNameBase.NewBotanicalInstance(null);
+ BotanicalName newSynonymName = TaxonNameFactory.NewBotanicalInstance(null);
newSynonymName.setTitleCache("New Synonym", true);
operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
undoContext, taxon, group, newSynonymName, postOperation);
TaxonNode taxonNode = taxonNodeService.load(taxonNodeUuid);
Taxon taxon = taxonNode.getTaxon();
HomotypicalGroup group = taxon.getHomotypicGroup();
- BotanicalName newSynonymName = TaxonNameBase.NewBotanicalInstance(null);
+ BotanicalName newSynonymName = TaxonNameFactory.NewBotanicalInstance(null);
newSynonymName.setTitleCache("New Synonym", true);
operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
undoContext, taxon, group, newSynonymName, postOperation);
taxonNodeService.merge(taxonNode);
- newSynonymName = TaxonNameBase.NewBotanicalInstance(null);
+ newSynonymName = TaxonNameFactory.NewBotanicalInstance(null);
newSynonymName.setTitleCache("Another New Synonym", true);
operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
undoContext, taxon, group, newSynonymName, postOperation);
@Test
public void addTaxon() {
- NonViralName taxonName = TaxonNameBase.NewNonViralInstance(null);
+ NonViralName taxonName = TaxonNameFactory.NewNonViralInstance(null);
Taxon taxon = Taxon.NewInstance(taxonName, null);
taxonService.merge(taxon);
}