Merge branch 'develop' into wset

[taxeditor.git] / eu.etaxonomy.taxeditor.navigation / src / main / java / eu / etaxonomy / taxeditor / navigation / navigator / IterableSynonymyList.java

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/IterableSynonymyList.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/IterableSynonymyList.java
index 86ab8ee23b3be0e0f821b9f9c3d89d85e5643329..cbd9453e8377a8b8434d017b1d81606eb1ab2be4 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/IterableSynonymyList.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/IterableSynonymyList.java
@@ -62,11 +62,11 @@ public class IterableSynonymyList implements Iterable<TaxonBase> {
                        HomotypicalGroup homotypicGroup = taxon.getHomotypicGroup();
                        
                        if (homotypicGroup != null) {
-                               List<Synonym> homotypicSynonyms = taxon.getSynonymsInGroup(homotypicGroup);//homotypicGroup.getSynonymsInGroup(taxon.getSec());
+                               List<Synonym> homotypicSynonyms = taxon.getSynonymsInGroup(homotypicGroup);
                                for (Synonym synonym : homotypicSynonyms) {
 
                                        // Make sure synonym belongs to the taxon
-                                       if (synonym.getAcceptedTaxa().contains(taxon)) {
+                                       if (synonym.getAcceptedTaxon() != null && synonym.getAcceptedTaxon().equals(taxon)) {
                                                synonymyList.add(synonym);
                                        }
                                }
@@ -78,12 +78,11 @@ public class IterableSynonymyList implements Iterable<TaxonBase> {
                                // Make sure this is not the taxon's homotypic group
                                if (!heterotypicGroup.equals(homotypicGroup)) {
                                                                
-                                       List<Synonym> heterotypicSynonyms = taxon.getSynonymsInGroup(heterotypicGroup);//heterotypicGroup.
-                                                       //getSynonymsInGroup(taxon.getSec());
+                                       List<Synonym> heterotypicSynonyms = taxon.getSynonymsInGroup(heterotypicGroup);
                                        for (Synonym synonym : heterotypicSynonyms) {
 
                                                // Make sure synonym belongs to the taxon
-                                               if (synonym.getAcceptedTaxa().contains(taxon)) {
+                                               if (synonym.getAcceptedTaxon() != null && synonym.getAcceptedTaxon().equals(taxon)) {
                                                        synonymyList.add(synonym);
                                                }
                                        }