ref #7335 exchange Taxon.getProParteSynonyms() by .getProParteAndPartialSynonyms()

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ContainerFactoryE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ContainerFactoryE4.java
index 592272f39ff5e3c9acbb04daca1e84ffa18dab18..a976395f924c6c2631541eba289e30a5344028cf 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ContainerFactoryE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ContainerFactoryE4.java
@@ -79,7 +79,7 @@ public class ContainerFactoryE4 {
                TaxonNameEditorE4 taxonNameEditor) {
                MisappliedGroupE4 group = taxonNameEditor.getMisappliedGroup();
                Taxon taxon = HibernateProxyHelper.deproxy(taxonNameEditor.getTaxon(), Taxon.class);
-               if(taxon.getMisappliedNames(true).isEmpty() && taxon.getProParteSynonyms().isEmpty()){
+               if(taxon.getMisappliedNames(true).isEmpty() && taxon.getProParteAndPartialSynonyms().isEmpty()){
                        taxonNameEditor.removeGroup(group);
                        taxonNameEditor.setMisapplicationsGroup(null);
                }else{

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/MisappliedGroupE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/MisappliedGroupE4.java
index 4faf79d55f7111a3bbdf2315b021a0ddf7cf7766..c81d84092c27adfa5adefd447f972a6571b0b3ec 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/MisappliedGroupE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/MisappliedGroupE4.java
@@ -37,7 +37,7 @@ public class MisappliedGroupE4 extends AbstractGroupE4{
                        this.add(container);
                        container.createContent();
                }
-               for(Taxon misapplication : getEditor().getTaxon().getProParteSynonyms()){
+               for(Taxon misapplication : getEditor().getTaxon().getProParteAndPartialSynonyms()){
             ConceptContainerE4 container = new ConceptContainerE4(this, misapplication, false);
             this.add(container);
             container.createContent();
@@ -53,9 +53,9 @@ public class MisappliedGroupE4 extends AbstractGroupE4{
 
        private boolean redrawNeeded() {
                Set<Taxon> misapplications = getEditor().getTaxon().getMisappliedNames(true);
-               misapplications.addAll(getEditor().getTaxon().getProParteSynonyms());
+               misapplications.addAll(getEditor().getTaxon().getProParteAndPartialSynonyms());
 
-               Set<Taxon> presentMisapplication = new HashSet<Taxon>();
+               Set<Taxon> presentMisapplication = new HashSet<>();
 
                for (AbstractGroupedContainerE4<Taxon> container  : getGroupedContainers()){
                        presentMisapplication.add(container.getData());