ref #6446 merge taxon name subclasses in TaxEditor

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / test / java / eu / etaxonomy / taxeditor / editor / name / operation / SwapSynonymAndAcceptedOperationTest.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java
index 848fcf555f7ed3759f68124126f67cce77074616..b5f9085651d9780a54c5c621fdafeb20c5570c20 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java
+++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java
@@ -19,8 +19,8 @@ import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 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.INonViralName;
+import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.SynonymType;
@@ -41,9 +41,9 @@ public class SwapSynonymAndAcceptedOperationTest extends AbstractTaxeditorOperat
 
        private static Taxon taxon;
 
-       private static Taxon parentTaxon;
-
-       private static Synonym homotypicSynonym;
+//     private static Taxon parentTaxon;
+//
+//     private static Synonym homotypicSynonym;
 
        private static Synonym oldHeterotypicSynonym;
 
@@ -55,13 +55,13 @@ public class SwapSynonymAndAcceptedOperationTest extends AbstractTaxeditorOperat
 
        private static TaxonRelationshipType conceptRelationshipType;
 
-       private static Taxon childTaxon;
+//     private static Taxon childTaxon;
 
        private static TaxonDescription description;
 
-       private static NonViralName<?> oldSynonymName;
+       private static INonViralName oldSynonymName;
 
-       private static NonViralName<?> oldTaxonName;
+       private static INonViralName oldTaxonName;
 
 
        /**