Project

General

Profile

« Previous | Next » 

Revision 42f99e54

Added by Andreas Müller about 7 years ago

ref #6362 and ref #6365 remove some NVN and Bot/Zoo name occurrences in TaxEditor

View differences:

eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperationTest.java
19 19
import eu.etaxonomy.cdm.model.common.ICdmBase;
20 20
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
21 21
import eu.etaxonomy.cdm.model.name.NonViralName;
22
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
22 23
import eu.etaxonomy.cdm.model.taxon.Synonym;
23 24
import eu.etaxonomy.cdm.model.taxon.Taxon;
24 25
import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
......
52 53
	@BeforeClass
53 54
	public static void setUpBeforeClass() throws Exception {
54 55
		taxon = Taxon.NewInstance(null, null);
55
		concept = Taxon.NewInstance(NonViralName.NewInstance(null), null);
56
		concept = Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
56 57
		homotypicalGroup = HomotypicalGroup.NewInstance();
57 58
		
58 59
		concept.addTaxonRelation(taxon, TaxonRelationshipType.MISAPPLIED_NAME_FOR(), null, null);
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicGroupOperationTest.java
19 19
import eu.etaxonomy.cdm.model.common.ICdmBase;
20 20
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
21 21
import eu.etaxonomy.cdm.model.name.NonViralName;
22
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
22 23
import eu.etaxonomy.cdm.model.taxon.Synonym;
23 24
import eu.etaxonomy.cdm.model.taxon.Taxon;
24 25
import eu.etaxonomy.taxeditor.editor.name.operation.ChangeHomotypicGroupOperation;
......
56 57
	public static void setUpBeforeClass() throws Exception {
57 58
		
58 59
		taxon = Taxon.NewInstance(null, null);
59
		synonym = Synonym.NewInstance(NonViralName.NewInstance(null), null);
60
		synonym = Synonym.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
60 61
		
61 62
		oldHomotypicalGroup = HomotypicalGroup.NewInstance();
62 63
		oldHomotypicalGroup.addTypifiedName(synonym.getName());
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToConceptOperationTest.java
17 17

  
18 18
import eu.etaxonomy.cdm.model.common.ICdmBase;
19 19
import eu.etaxonomy.cdm.model.name.NonViralName;
20
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
20 21
import eu.etaxonomy.cdm.model.taxon.Synonym;
21 22
import eu.etaxonomy.cdm.model.taxon.SynonymType;
22 23
import eu.etaxonomy.cdm.model.taxon.Taxon;
......
46 47
	public static void setUpBeforeClass() throws Exception {
47 48
		
48 49
		taxon = Taxon.NewInstance(null, null);
49
		synonym = Synonym.NewInstance(NonViralName.NewInstance(null), null);
50
		synonym = Synonym.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
50 51
		taxonRelationshipType = TaxonRelationshipType.CONTRADICTION();
51 52
		
52 53
		taxon.addSynonym(synonym, SynonymType.SYNONYM_OF());
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperationTest.java
17 17

  
18 18
import eu.etaxonomy.cdm.model.common.ICdmBase;
19 19
import eu.etaxonomy.cdm.model.name.NonViralName;
20
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
20 21
import eu.etaxonomy.cdm.model.taxon.Synonym;
21 22
import eu.etaxonomy.cdm.model.taxon.SynonymType;
22 23
import eu.etaxonomy.cdm.model.taxon.Taxon;
......
46 47
	@BeforeClass
47 48
	public static void setUpBeforeClass() throws Exception {
48 49
		taxon = Taxon.NewInstance(null, null);
49
		synonym = Synonym.NewInstance(NonViralName.NewInstance(null), null);
50
		synonym = Synonym.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
50 51
		synonymType = SynonymType.SYNONYM_OF();
51 52
		taxon.addSynonym(synonym, synonymType);
52 53
		
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInExisitingHomotypicalGroupOperationTest.java
16 16

  
17 17
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
18 18
import eu.etaxonomy.cdm.model.name.NonViralName;
19
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
19 20
import eu.etaxonomy.cdm.model.taxon.SynonymType;
20 21
import eu.etaxonomy.cdm.model.taxon.Taxon;
21 22
import eu.etaxonomy.taxeditor.store.operations.AbstractTaxeditorOperationTestBase;
......
39 40
	@Before
40 41
	public void setUp() throws Exception {
41 42

  
42
		taxonName = NonViralName.NewInstance(null);
43
		taxonName = TaxonNameBase.NewNonViralInstance(null);
43 44
		taxon = Taxon.NewInstance(taxonName, null);
44 45

  
45 46
		homotypicalGroup = HomotypicalGroup.NewInstance();
46
		newSynonymName = NonViralName.NewInstance(null);
47
		newSynonymName = TaxonNameBase.NewNonViralInstance(null);
47 48

  
48 49
		operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
49 50
							undoContext, taxon, homotypicalGroup, newSynonymName, postOperation);
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperationTest.java
36 36
	public static void setUpBeforeClass() throws Exception {
37 37
		
38 38
		taxon = Taxon.NewInstance(null, null);
39
		newSynonymName = NonViralName.NewInstance(null);
39
		newSynonymName = TaxonNameBase.NewNonViralInstance(null);
40 40
		
41 41
		operation = new CreateSynonymInNewGroupOperation("Create Synonyma In New Group",  undoContext, taxon, newSynonymName, postOperation);
42 42
	}
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java
20 20
import eu.etaxonomy.cdm.model.description.TaxonDescription;
21 21
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
22 22
import eu.etaxonomy.cdm.model.name.NonViralName;
23
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
23 24
import eu.etaxonomy.cdm.model.taxon.Synonym;
24 25
import eu.etaxonomy.cdm.model.taxon.SynonymType;
25 26
import eu.etaxonomy.cdm.model.taxon.Taxon;
......
71 72
		(new DefaultTermInitializer()).initialize();
72 73

  
73 74
		// Create the original accepted taxon
74
		oldTaxonName = NonViralName.NewInstance(null);
75
		oldTaxonName = TaxonNameBase.NewNonViralInstance(null);
75 76
		taxon = Taxon.NewInstance(oldTaxonName, null);
76 77

  
77 78
//		// Create its parent taxon
78
//		parentTaxon = Taxon.NewInstance(NonViralName.NewInstance(null), null);
79
//		parentTaxon = Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
79 80
//		parentTaxon.addTaxonomicChild(taxon, null, null);
80 81
//
81 82
//		// Give it a child taxon
82
//		childTaxon = Taxon.NewInstance(NonViralName.NewInstance(null), null);
83
//		childTaxon = Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
83 84
//		childTaxon.setTaxonomicParent(taxon, null, null);
84 85

  
85 86
		// Create a homotypic synonym for the accepted taxon
86
		taxon.addHomotypicSynonymName(NonViralName.NewInstance(null));
87
//		homotypicSynonym = Synonym.NewInstance(NonViralName.NewInstance(null), null);
87
		taxon.addHomotypicSynonymName(TaxonNameBase.NewNonViralInstance(null));
88
//		homotypicSynonym = Synonym.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
88 89
//		HomotypicalGroup acceptedHomotypicalGroup = HomotypicalGroup.NewInstance();
89 90
//		acceptedHomotypicalGroup.addTypifiedName(oldTaxon.getName());
90 91
//		acceptedHomotypicalGroup.addTypifiedName(homotypicSynonym.getName());
91 92

  
92 93
		// Create a heterotypic synonym that will be used to create the new accepted taxon
93
		oldSynonymName = NonViralName.NewInstance(null);
94
		oldSynonymName = TaxonNameBase.NewNonViralInstance(null);
94 95
		oldHeterotypicSynonym = Synonym.NewInstance(oldSynonymName, null);
95 96
//		oldTaxon.addS .addHeterotypicSynonym(oldHeterotypicSynonym, null, null);
96 97
		heteroypicalGroup = HomotypicalGroup.NewInstance();
......
98 99
		taxon.addSynonym(oldHeterotypicSynonym, SynonymType.HETEROTYPIC_SYNONYM_OF());
99 100

  
100 101
		// Create a misapplication
101
		misapplication = Taxon.NewInstance(NonViralName.NewInstance(null), null);
102
		misapplication = Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
102 103
		taxon.addMisappliedName(misapplication, null, null);
103 104

  
104 105
		// Create a concept relation
105
		concept = Taxon.NewInstance(NonViralName.NewInstance(null), null);
106
		concept = Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
106 107
		conceptRelationshipType = TaxonRelationshipType.CONGRUENT_TO();
107 108
		concept.addTaxonRelation(taxon, conceptRelationshipType, null, null);
108 109

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java
13 13
import eu.etaxonomy.cdm.model.name.BotanicalName;
14 14
import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
15 15
import eu.etaxonomy.cdm.model.name.NonViralName;
16
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
16 17
import eu.etaxonomy.cdm.model.name.ZoologicalName;
17 18
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
18 19
import eu.etaxonomy.taxeditor.store.CdmStore;
......
38 39
	protected NonViralName createNewEntity() {
39 40
		NomenclaturalCode code = PreferencesUtil.getPreferredNomenclaturalCode();
40 41
		if(code.equals(NomenclaturalCode.ICNAFP )){
41
			return BotanicalName.NewInstance(null);
42
			return TaxonNameBase.NewBotanicalInstance(null);
42 43
		}else if(code.equals(NomenclaturalCode.ICZN)){
43
			return ZoologicalName.NewInstance(null);
44
			return TaxonNameBase.NewZoologicalInstance(null);
44 45
		}
45 46
		return null;
46 47
	}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonWizard.java
11 11

  
12 12
import eu.etaxonomy.cdm.api.service.ITaxonService;
13 13
import eu.etaxonomy.cdm.model.name.NonViralName;
14
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
14 15
import eu.etaxonomy.cdm.model.taxon.Taxon;
15 16
import eu.etaxonomy.taxeditor.store.CdmStore;
16 17
import eu.etaxonomy.taxeditor.ui.section.name.NonViralNameWizardPage;
......
34 35
	/** {@inheritDoc} */
35 36
	@Override
36 37
	protected Taxon createNewEntity() {
37
		return Taxon.NewInstance(NonViralName.NewInstance(null), null);
38
		return Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
38 39
	}
39 40

  
40 41
	/** {@inheritDoc} */
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailElement.java
14 14
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
15 15
import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
16 16
import eu.etaxonomy.cdm.model.name.NonViralName;
17
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
17 18
import eu.etaxonomy.cdm.model.name.ZoologicalName;
18 19
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
19 20
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
......
121 122
	@Override
122 123
	public void updateContent() {
123 124
		if (getEntity() == null) {
124
			setEntity(NonViralName.NewInstance(null));
125
			setEntity(TaxonNameBase.NewNonViralInstance(null));
125 126
		}
126 127

  
127 128
		super.updateContent();
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
19 19
import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
20 20
import eu.etaxonomy.cdm.model.name.NonViralName;
21 21
import eu.etaxonomy.cdm.model.name.Rank;
22
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
22 23
import eu.etaxonomy.cdm.model.name.ZoologicalName;
23 24
import eu.etaxonomy.cdm.strategy.parser.ParserProblem;
24 25
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
......
125 126
	@Override
126 127
	protected void updateContent() {
127 128
		if(getEntity() == null){
128
			setEntity(NonViralName.NewInstance(null));
129
			setEntity(TaxonNameBase.NewNonViralInstance(null));
129 130
		}
130 131

  
131 132
		super.updateContent();
eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/NameProtectTitleCacheTest.java
18 18
import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
19 19
import eu.etaxonomy.cdm.model.name.NonViralName;
20 20
import eu.etaxonomy.cdm.model.name.Rank;
21
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
21 22

  
22 23
/**
23 24
 * @author n.hoffmann
......
45 46
		
46 47
		(new DefaultTermInitializer()).initialize();
47 48
		
48
		name = NonViralName.NewInstance(Rank.SPECIES());
49
		name = TaxonNameBase.NewNonViralInstance(Rank.SPECIES());
49 50
		
50 51
		name.setGenusOrUninomial("Joe");
51 52
		name.setSpecificEpithet("mama");
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/AbstractLazyInitializerTest.java
140 140
        public void testCDMEntitySaveLazyNew() {
141 141
            Team combAuthor = Team.NewInstance();
142 142
            combAuthor.addTeamMember(Person.NewTitledInstance("test member"));
143
            BotanicalName name = BotanicalName.NewInstance(null, "Test1", null, null, null, null, null, null, null);
143
            BotanicalName name = TaxonNameBase.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
144 144
            name.setCombinationAuthorship(combAuthor);
145 145
            Taxon tax1 = Taxon.NewInstance(name, null);
146 146
            UUID taxonUuid1 = taxonService.save(tax1).getUuid();
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/RemoteLazyLoadingTest.java
140 140

  
141 141
        Team combAuthor = Team.NewInstance();
142 142
        combAuthor.addTeamMember(Person.NewTitledInstance("test member"));
143
        BotanicalName name = BotanicalName.NewInstance(null, "Test1", null, null, null, null, null, null, null);
143
        BotanicalName name = TaxonNameBase.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
144 144
        name.setCombinationAuthorship(combAuthor);
145 145
        Taxon taxon = Taxon.NewInstance(name, null);
146 146
        UUID taxonUuid = taxonService.save(taxon).getUuid();
......
202 202
    public void testCDMEntitySaveLazyNew() {
203 203
        Team combAuthor = Team.NewInstance();
204 204
        combAuthor.addTeamMember(Person.NewTitledInstance("test member"));
205
        BotanicalName name = BotanicalName.NewInstance(null, "Test1", null, null, null, null, null, null, null);
205
        BotanicalName name = TaxonNameBase.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
206 206
        name.setCombinationAuthorship(combAuthor);
207 207
        Taxon tax1 = Taxon.NewInstance(name, null);
208 208
        UUID taxonUuid1 = taxonService.save(tax1).getUuid();
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/TaxonNameEditorTest.java
65 65
        TaxonNode taxonNode = taxonNodeService.load(taxonNodeUuid);
66 66
        Taxon taxon = taxonNode.getTaxon();
67 67
        HomotypicalGroup group = taxon.getHomotypicGroup();
68
        BotanicalName newSynonymName = BotanicalName.NewInstance(null);
68
        BotanicalName newSynonymName = TaxonNameBase.NewBotanicalInstance(null);
69 69
        newSynonymName.setTitleCache("New Synonym", true);
70 70
        operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
71 71
                undoContext, taxon, group, newSynonymName, postOperation);
......
86 86
        TaxonNode taxonNode = taxonNodeService.load(taxonNodeUuid);
87 87
        Taxon taxon = taxonNode.getTaxon();
88 88
        HomotypicalGroup group = taxon.getHomotypicGroup();
89
        BotanicalName newSynonymName = BotanicalName.NewInstance(null);
89
        BotanicalName newSynonymName = TaxonNameBase.NewBotanicalInstance(null);
90 90
        newSynonymName.setTitleCache("New Synonym", true);
91 91
        operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
92 92
                undoContext, taxon, group, newSynonymName, postOperation);
......
104 104
        TaxonNode taxonNode = taxonNodeService.load(taxonNodeUuid);
105 105
        Taxon taxon = taxonNode.getTaxon();
106 106
        HomotypicalGroup group = taxon.getHomotypicGroup();
107
        BotanicalName newSynonymName = BotanicalName.NewInstance(null);
107
        BotanicalName newSynonymName = TaxonNameBase.NewBotanicalInstance(null);
108 108
        newSynonymName.setTitleCache("New Synonym", true);
109 109
        operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
110 110
                undoContext, taxon, group, newSynonymName, postOperation);
......
120 120

  
121 121
        taxonNodeService.merge(taxonNode);
122 122

  
123
        newSynonymName = BotanicalName.NewInstance(null);
123
        newSynonymName = TaxonNameBase.NewBotanicalInstance(null);
124 124
        newSynonymName.setTitleCache("Another New Synonym", true);
125 125
        operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
126 126
                undoContext, taxon, group, newSynonymName, postOperation);
......
152 152

  
153 153
    @Test
154 154
    public void addTaxon() {
155
        NonViralName taxonName = NonViralName.NewInstance(null);
155
        NonViralName taxonName = TaxonNameBase.NewNonViralInstance(null);
156 156
        Taxon taxon = Taxon.NewInstance(taxonName, null);
157 157
        taxonService.merge(taxon);
158 158
    }

Also available in: Unified diff