Revision e48774bc
Added by Andreas Müller about 7 years ago
| eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperationTest.java | ||
|---|---|---|
| 20 | 20 |
import eu.etaxonomy.cdm.model.name.HomotypicalGroup; |
| 21 | 21 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 22 | 22 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 23 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
|
| 23 | 24 |
import eu.etaxonomy.cdm.model.taxon.Synonym; |
| 24 | 25 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| 25 | 26 |
import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; |
| ... | ... | |
| 53 | 54 |
@BeforeClass |
| 54 | 55 |
public static void setUpBeforeClass() throws Exception {
|
| 55 | 56 |
taxon = Taxon.NewInstance(null, null); |
| 56 |
concept = Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
|
|
| 57 |
concept = Taxon.NewInstance(TaxonNameFactory.NewNonViralInstance(null), null);
|
|
| 57 | 58 |
homotypicalGroup = HomotypicalGroup.NewInstance(); |
| 58 | 59 |
|
| 59 | 60 |
concept.addTaxonRelation(taxon, TaxonRelationshipType.MISAPPLIED_NAME_FOR(), null, null); |
| eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicGroupOperationTest.java | ||
|---|---|---|
| 20 | 20 |
import eu.etaxonomy.cdm.model.name.HomotypicalGroup; |
| 21 | 21 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 22 | 22 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 23 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
|
| 23 | 24 |
import eu.etaxonomy.cdm.model.taxon.Synonym; |
| 24 | 25 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| 25 | 26 |
import eu.etaxonomy.taxeditor.editor.name.operation.ChangeHomotypicGroupOperation; |
| ... | ... | |
| 57 | 58 |
public static void setUpBeforeClass() throws Exception {
|
| 58 | 59 |
|
| 59 | 60 |
taxon = Taxon.NewInstance(null, null); |
| 60 |
synonym = Synonym.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
|
|
| 61 |
synonym = Synonym.NewInstance(TaxonNameFactory.NewNonViralInstance(null), null);
|
|
| 61 | 62 |
|
| 62 | 63 |
oldHomotypicalGroup = HomotypicalGroup.NewInstance(); |
| 63 | 64 |
oldHomotypicalGroup.addTypifiedName(synonym.getName()); |
| eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToConceptOperationTest.java | ||
|---|---|---|
| 18 | 18 |
import eu.etaxonomy.cdm.model.common.ICdmBase; |
| 19 | 19 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 20 | 20 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 21 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
|
| 21 | 22 |
import eu.etaxonomy.cdm.model.taxon.Synonym; |
| 22 | 23 |
import eu.etaxonomy.cdm.model.taxon.SynonymType; |
| 23 | 24 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| ... | ... | |
| 47 | 48 |
public static void setUpBeforeClass() throws Exception {
|
| 48 | 49 |
|
| 49 | 50 |
taxon = Taxon.NewInstance(null, null); |
| 50 |
synonym = Synonym.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
|
|
| 51 |
synonym = Synonym.NewInstance(TaxonNameFactory.NewNonViralInstance(null), null);
|
|
| 51 | 52 |
taxonRelationshipType = TaxonRelationshipType.CONTRADICTION(); |
| 52 | 53 |
|
| 53 | 54 |
taxon.addSynonym(synonym, SynonymType.SYNONYM_OF()); |
| eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperationTest.java | ||
|---|---|---|
| 18 | 18 |
import eu.etaxonomy.cdm.model.common.ICdmBase; |
| 19 | 19 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 20 | 20 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 21 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
|
| 21 | 22 |
import eu.etaxonomy.cdm.model.taxon.Synonym; |
| 22 | 23 |
import eu.etaxonomy.cdm.model.taxon.SynonymType; |
| 23 | 24 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| ... | ... | |
| 47 | 48 |
@BeforeClass |
| 48 | 49 |
public static void setUpBeforeClass() throws Exception {
|
| 49 | 50 |
taxon = Taxon.NewInstance(null, null); |
| 50 |
synonym = Synonym.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
|
|
| 51 |
synonym = Synonym.NewInstance(TaxonNameFactory.NewNonViralInstance(null), null);
|
|
| 51 | 52 |
synonymType = SynonymType.SYNONYM_OF(); |
| 52 | 53 |
taxon.addSynonym(synonym, synonymType); |
| 53 | 54 |
|
| eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInExisitingHomotypicalGroupOperationTest.java | ||
|---|---|---|
| 17 | 17 |
import eu.etaxonomy.cdm.model.name.HomotypicalGroup; |
| 18 | 18 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 19 | 19 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 20 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
|
| 20 | 21 |
import eu.etaxonomy.cdm.model.taxon.SynonymType; |
| 21 | 22 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| 22 | 23 |
import eu.etaxonomy.taxeditor.store.operations.AbstractTaxeditorOperationTestBase; |
| ... | ... | |
| 40 | 41 |
@Before |
| 41 | 42 |
public void setUp() throws Exception {
|
| 42 | 43 |
|
| 43 |
taxonName = TaxonNameBase.NewNonViralInstance(null);
|
|
| 44 |
taxonName = TaxonNameFactory.NewNonViralInstance(null);
|
|
| 44 | 45 |
taxon = Taxon.NewInstance(taxonName, null); |
| 45 | 46 |
|
| 46 | 47 |
homotypicalGroup = HomotypicalGroup.NewInstance(); |
| 47 |
newSynonymName = TaxonNameBase.NewNonViralInstance(null);
|
|
| 48 |
newSynonymName = TaxonNameFactory.NewNonViralInstance(null);
|
|
| 48 | 49 |
|
| 49 | 50 |
operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
|
| 50 | 51 |
undoContext, taxon, homotypicalGroup, newSynonymName, postOperation); |
| eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperationTest.java | ||
|---|---|---|
| 16 | 16 |
|
| 17 | 17 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 18 | 18 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 19 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
|
| 19 | 20 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| 20 | 21 |
import eu.etaxonomy.taxeditor.editor.name.operation.CreateSynonymInNewGroupOperation; |
| 21 | 22 |
import eu.etaxonomy.taxeditor.store.operations.AbstractTaxeditorOperationTestBase; |
| ... | ... | |
| 36 | 37 |
public static void setUpBeforeClass() throws Exception {
|
| 37 | 38 |
|
| 38 | 39 |
taxon = Taxon.NewInstance(null, null); |
| 39 |
newSynonymName = TaxonNameBase.NewNonViralInstance(null);
|
|
| 40 |
newSynonymName = TaxonNameFactory.NewNonViralInstance(null);
|
|
| 40 | 41 |
|
| 41 | 42 |
operation = new CreateSynonymInNewGroupOperation("Create Synonyma In New Group", undoContext, taxon, newSynonymName, postOperation);
|
| 42 | 43 |
} |
| eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java | ||
|---|---|---|
| 21 | 21 |
import eu.etaxonomy.cdm.model.name.HomotypicalGroup; |
| 22 | 22 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 23 | 23 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 24 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
|
| 24 | 25 |
import eu.etaxonomy.cdm.model.taxon.Synonym; |
| 25 | 26 |
import eu.etaxonomy.cdm.model.taxon.SynonymType; |
| 26 | 27 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| ... | ... | |
| 72 | 73 |
(new DefaultTermInitializer()).initialize(); |
| 73 | 74 |
|
| 74 | 75 |
// Create the original accepted taxon |
| 75 |
oldTaxonName = TaxonNameBase.NewNonViralInstance(null);
|
|
| 76 |
oldTaxonName = TaxonNameFactory.NewNonViralInstance(null);
|
|
| 76 | 77 |
taxon = Taxon.NewInstance(oldTaxonName, null); |
| 77 | 78 |
|
| 78 | 79 |
// // Create its parent taxon |
| ... | ... | |
| 84 | 85 |
// childTaxon.setTaxonomicParent(taxon, null, null); |
| 85 | 86 |
|
| 86 | 87 |
// Create a homotypic synonym for the accepted taxon |
| 87 |
taxon.addHomotypicSynonymName(TaxonNameBase.NewNonViralInstance(null));
|
|
| 88 |
taxon.addHomotypicSynonymName(TaxonNameFactory.NewNonViralInstance(null));
|
|
| 88 | 89 |
// homotypicSynonym = Synonym.NewInstance(TaxonNameBase.NewNonViralInstance(null), null); |
| 89 | 90 |
// HomotypicalGroup acceptedHomotypicalGroup = HomotypicalGroup.NewInstance(); |
| 90 | 91 |
// acceptedHomotypicalGroup.addTypifiedName(oldTaxon.getName()); |
| 91 | 92 |
// acceptedHomotypicalGroup.addTypifiedName(homotypicSynonym.getName()); |
| 92 | 93 |
|
| 93 | 94 |
// Create a heterotypic synonym that will be used to create the new accepted taxon |
| 94 |
oldSynonymName = TaxonNameBase.NewNonViralInstance(null);
|
|
| 95 |
oldSynonymName = TaxonNameFactory.NewNonViralInstance(null);
|
|
| 95 | 96 |
oldHeterotypicSynonym = Synonym.NewInstance(oldSynonymName, null); |
| 96 | 97 |
// oldTaxon.addS .addHeterotypicSynonym(oldHeterotypicSynonym, null, null); |
| 97 | 98 |
heteroypicalGroup = HomotypicalGroup.NewInstance(); |
| ... | ... | |
| 99 | 100 |
taxon.addSynonym(oldHeterotypicSynonym, SynonymType.HETEROTYPIC_SYNONYM_OF()); |
| 100 | 101 |
|
| 101 | 102 |
// Create a misapplication |
| 102 |
misapplication = Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
|
|
| 103 |
misapplication = Taxon.NewInstance(TaxonNameFactory.NewNonViralInstance(null), null);
|
|
| 103 | 104 |
taxon.addMisappliedName(misapplication, null, null); |
| 104 | 105 |
|
| 105 | 106 |
// Create a concept relation |
| 106 |
concept = Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
|
|
| 107 |
concept = Taxon.NewInstance(TaxonNameFactory.NewNonViralInstance(null), null);
|
|
| 107 | 108 |
conceptRelationshipType = TaxonRelationshipType.CONGRUENT_TO(); |
| 108 | 109 |
concept.addTaxonRelation(taxon, conceptRelationshipType, null, null); |
| 109 | 110 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java | ||
|---|---|---|
| 14 | 14 |
import eu.etaxonomy.cdm.model.name.NomenclaturalCode; |
| 15 | 15 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 16 | 16 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 17 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
|
| 17 | 18 |
import eu.etaxonomy.cdm.model.name.ZoologicalName; |
| 18 | 19 |
import eu.etaxonomy.taxeditor.preference.PreferencesUtil; |
| 19 | 20 |
import eu.etaxonomy.taxeditor.store.CdmStore; |
| ... | ... | |
| 39 | 40 |
protected NonViralName createNewEntity() {
|
| 40 | 41 |
NomenclaturalCode code = PreferencesUtil.getPreferredNomenclaturalCode(); |
| 41 | 42 |
if(code.equals(NomenclaturalCode.ICNAFP )){
|
| 42 |
return TaxonNameBase.NewBotanicalInstance(null);
|
|
| 43 |
return TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 43 | 44 |
}else if(code.equals(NomenclaturalCode.ICZN)){
|
| 44 |
return TaxonNameBase.NewZoologicalInstance(null);
|
|
| 45 |
return TaxonNameFactory.NewZoologicalInstance(null);
|
|
| 45 | 46 |
} |
| 46 | 47 |
return null; |
| 47 | 48 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonWizard.java | ||
|---|---|---|
| 12 | 12 |
import eu.etaxonomy.cdm.api.service.ITaxonService; |
| 13 | 13 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 14 | 14 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 15 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
|
| 15 | 16 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| 16 | 17 |
import eu.etaxonomy.taxeditor.store.CdmStore; |
| 17 | 18 |
import eu.etaxonomy.taxeditor.ui.section.name.NonViralNameWizardPage; |
| ... | ... | |
| 35 | 36 |
/** {@inheritDoc} */
|
| 36 | 37 |
@Override |
| 37 | 38 |
protected Taxon createNewEntity() {
|
| 38 |
return Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
|
|
| 39 |
return Taxon.NewInstance(TaxonNameFactory.NewNonViralInstance(null), null);
|
|
| 39 | 40 |
} |
| 40 | 41 |
|
| 41 | 42 |
/** {@inheritDoc} */
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailElement.java | ||
|---|---|---|
| 15 | 15 |
import eu.etaxonomy.cdm.model.name.NomenclaturalCode; |
| 16 | 16 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 17 | 17 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 18 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
|
| 18 | 19 |
import eu.etaxonomy.cdm.model.name.ZoologicalName; |
| 19 | 20 |
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys; |
| 20 | 21 |
import eu.etaxonomy.taxeditor.preference.PreferencesUtil; |
| ... | ... | |
| 122 | 123 |
@Override |
| 123 | 124 |
public void updateContent() {
|
| 124 | 125 |
if (getEntity() == null) {
|
| 125 |
setEntity(TaxonNameBase.NewNonViralInstance(null));
|
|
| 126 |
setEntity(TaxonNameFactory.NewNonViralInstance(null));
|
|
| 126 | 127 |
} |
| 127 | 128 |
|
| 128 | 129 |
super.updateContent(); |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java | ||
|---|---|---|
| 20 | 20 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 21 | 21 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 22 | 22 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 23 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
|
| 23 | 24 |
import eu.etaxonomy.cdm.model.name.ZoologicalName; |
| 24 | 25 |
import eu.etaxonomy.cdm.strategy.parser.ParserProblem; |
| 25 | 26 |
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys; |
| ... | ... | |
| 126 | 127 |
@Override |
| 127 | 128 |
protected void updateContent() {
|
| 128 | 129 |
if(getEntity() == null){
|
| 129 |
setEntity(TaxonNameBase.NewNonViralInstance(null));
|
|
| 130 |
setEntity(TaxonNameFactory.NewNonViralInstance(null));
|
|
| 130 | 131 |
} |
| 131 | 132 |
|
| 132 | 133 |
super.updateContent(); |
| eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/NameProtectTitleCacheTest.java | ||
|---|---|---|
| 19 | 19 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 20 | 20 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 21 | 21 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 22 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
|
| 22 | 23 |
|
| 23 | 24 |
/** |
| 24 | 25 |
* @author n.hoffmann |
| ... | ... | |
| 46 | 47 |
|
| 47 | 48 |
(new DefaultTermInitializer()).initialize(); |
| 48 | 49 |
|
| 49 |
name = TaxonNameBase.NewNonViralInstance(Rank.SPECIES());
|
|
| 50 |
name = TaxonNameFactory.NewNonViralInstance(Rank.SPECIES());
|
|
| 50 | 51 |
|
| 51 | 52 |
name.setGenusOrUninomial("Joe");
|
| 52 | 53 |
name.setSpecificEpithet("mama");
|
| eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/AbstractLazyInitializerTest.java | ||
|---|---|---|
| 30 | 30 |
import eu.etaxonomy.cdm.model.name.BotanicalName; |
| 31 | 31 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 32 | 32 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 33 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
|
| 33 | 34 |
import eu.etaxonomy.cdm.model.taxon.Classification; |
| 34 | 35 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| 35 | 36 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
| ... | ... | |
| 140 | 141 |
public void testCDMEntitySaveLazyNew() {
|
| 141 | 142 |
Team combAuthor = Team.NewInstance(); |
| 142 | 143 |
combAuthor.addTeamMember(Person.NewTitledInstance("test member"));
|
| 143 |
BotanicalName name = TaxonNameBase.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
|
|
| 144 |
BotanicalName name = TaxonNameFactory.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
|
|
| 144 | 145 |
name.setCombinationAuthorship(combAuthor); |
| 145 | 146 |
Taxon tax1 = Taxon.NewInstance(name, null); |
| 146 | 147 |
UUID taxonUuid1 = taxonService.save(tax1).getUuid(); |
| eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/RemoteLazyLoadingTest.java | ||
|---|---|---|
| 30 | 30 |
import eu.etaxonomy.cdm.model.name.BotanicalName; |
| 31 | 31 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 32 | 32 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 33 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
|
| 33 | 34 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| 34 | 35 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
| 35 | 36 |
import eu.etaxonomy.cdm.model.taxon.TaxonRelationship; |
| ... | ... | |
| 140 | 141 |
|
| 141 | 142 |
Team combAuthor = Team.NewInstance(); |
| 142 | 143 |
combAuthor.addTeamMember(Person.NewTitledInstance("test member"));
|
| 143 |
BotanicalName name = TaxonNameBase.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
|
|
| 144 |
BotanicalName name = TaxonNameFactory.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
|
|
| 144 | 145 |
name.setCombinationAuthorship(combAuthor); |
| 145 | 146 |
Taxon taxon = Taxon.NewInstance(name, null); |
| 146 | 147 |
UUID taxonUuid = taxonService.save(taxon).getUuid(); |
| ... | ... | |
| 202 | 203 |
public void testCDMEntitySaveLazyNew() {
|
| 203 | 204 |
Team combAuthor = Team.NewInstance(); |
| 204 | 205 |
combAuthor.addTeamMember(Person.NewTitledInstance("test member"));
|
| 205 |
BotanicalName name = TaxonNameBase.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
|
|
| 206 |
BotanicalName name = TaxonNameFactory.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
|
|
| 206 | 207 |
name.setCombinationAuthorship(combAuthor); |
| 207 | 208 |
Taxon tax1 = Taxon.NewInstance(name, null); |
| 208 | 209 |
UUID taxonUuid1 = taxonService.save(tax1).getUuid(); |
| eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/TaxonNameEditorTest.java | ||
|---|---|---|
| 34 | 34 |
import eu.etaxonomy.cdm.model.name.HomotypicalGroup; |
| 35 | 35 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 36 | 36 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 37 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
|
| 37 | 38 |
import eu.etaxonomy.cdm.model.taxon.Synonym; |
| 38 | 39 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| 39 | 40 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
| ... | ... | |
| 65 | 66 |
TaxonNode taxonNode = taxonNodeService.load(taxonNodeUuid); |
| 66 | 67 |
Taxon taxon = taxonNode.getTaxon(); |
| 67 | 68 |
HomotypicalGroup group = taxon.getHomotypicGroup(); |
| 68 |
BotanicalName newSynonymName = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 69 |
BotanicalName newSynonymName = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 69 | 70 |
newSynonymName.setTitleCache("New Synonym", true);
|
| 70 | 71 |
operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
|
| 71 | 72 |
undoContext, taxon, group, newSynonymName, postOperation); |
| ... | ... | |
| 86 | 87 |
TaxonNode taxonNode = taxonNodeService.load(taxonNodeUuid); |
| 87 | 88 |
Taxon taxon = taxonNode.getTaxon(); |
| 88 | 89 |
HomotypicalGroup group = taxon.getHomotypicGroup(); |
| 89 |
BotanicalName newSynonymName = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 90 |
BotanicalName newSynonymName = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 90 | 91 |
newSynonymName.setTitleCache("New Synonym", true);
|
| 91 | 92 |
operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
|
| 92 | 93 |
undoContext, taxon, group, newSynonymName, postOperation); |
| ... | ... | |
| 104 | 105 |
TaxonNode taxonNode = taxonNodeService.load(taxonNodeUuid); |
| 105 | 106 |
Taxon taxon = taxonNode.getTaxon(); |
| 106 | 107 |
HomotypicalGroup group = taxon.getHomotypicGroup(); |
| 107 |
BotanicalName newSynonymName = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 108 |
BotanicalName newSynonymName = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 108 | 109 |
newSynonymName.setTitleCache("New Synonym", true);
|
| 109 | 110 |
operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
|
| 110 | 111 |
undoContext, taxon, group, newSynonymName, postOperation); |
| ... | ... | |
| 120 | 121 |
|
| 121 | 122 |
taxonNodeService.merge(taxonNode); |
| 122 | 123 |
|
| 123 |
newSynonymName = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 124 |
newSynonymName = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 124 | 125 |
newSynonymName.setTitleCache("Another New Synonym", true);
|
| 125 | 126 |
operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
|
| 126 | 127 |
undoContext, taxon, group, newSynonymName, postOperation); |
| ... | ... | |
| 152 | 153 |
|
| 153 | 154 |
@Test |
| 154 | 155 |
public void addTaxon() {
|
| 155 |
NonViralName taxonName = TaxonNameBase.NewNonViralInstance(null);
|
|
| 156 |
NonViralName taxonName = TaxonNameFactory.NewNonViralInstance(null);
|
|
| 156 | 157 |
Taxon taxon = Taxon.NewInstance(taxonName, null); |
| 157 | 158 |
taxonService.merge(taxon); |
| 158 | 159 |
} |
Also available in: Unified diff
ref #6365 use TaxonNameFactory for factory methods in TaxEditor