#ref #5496 Do not show any terms for preservation method and stage

preferences

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/AbstractMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/AbstractMenuPreferences.java
index aa04200f5783a1a522f5a6c9ec7d58ba61529c2f..110945b8fe2496ca72ea4696dff56d68606c47b9 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/AbstractMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/AbstractMenuPreferences.java
@@ -92,7 +92,7 @@ public abstract class AbstractMenuPreferences<T extends DefinedTermBase> extends
        }
 
        protected List<T> getTerms(){
        }
 
        protected List<T> getTerms(){

-           if(!CdmStore.isActive()) {
+           if(!CdmStore.isActive() || getTermClass()==null) {

                return new ArrayList<T>();
            } else {
                return TermStore.getTerms(getTermClass());
                return new ArrayList<T>();
            } else {
                return TermStore.getTerms(getTermClass());

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/PreservationMethodMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/PreservationMethodMenuPreferences.java
index dfaa62d7a718e7fad050b60b24900a8e8cdb0c5b..ad6bbe9c615173509daee5fa2a7a6b3988af949f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/PreservationMethodMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/PreservationMethodMenuPreferences.java
@@ -39,6 +39,6 @@ public class PreservationMethodMenuPreferences extends AbstractMenuPreferences<D
        /** {@inheritDoc} */
        @Override
        protected Class<DefinedTerm> getTermClass() {
        /** {@inheritDoc} */
        @Override
        protected Class<DefinedTerm> getTermClass() {

-               return DefinedTerm.class;
+               return null;

        }
 }
        }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java
index 566e9a7364a6df9fa90ec1164f62c9fa562bc79e..78ffeae14882ee733b6f70cf3bed8ba05b6e8119 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java
@@ -37,7 +37,7 @@ public class StageMenuPreferences extends AbstractMenuPreferences<DefinedTerm> {
        /** {@inheritDoc} */
        @Override
        protected Class<DefinedTerm> getTermClass() {
        /** {@inheritDoc} */
        @Override
        protected Class<DefinedTerm> getTermClass() {

-               return DefinedTerm.class;
+               return null;

        }
 
 }
        }
 
 }