From c0c4641392ecf5c2bf075a493facc09345f12199 Mon Sep 17 00:00:00 2001 From: Patrick Plitzner Date: Mon, 24 Oct 2016 13:36:34 +0200 Subject: [PATCH] #ref #5496 Do not show any terms for preservation method and stage preferences --- .../taxeditor/preference/menu/AbstractMenuPreferences.java | 2 +- .../preference/menu/PreservationMethodMenuPreferences.java | 2 +- .../taxeditor/preference/menu/StageMenuPreferences.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 aa04200f5..110945b8f 100644 --- 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 extends } protected List getTerms(){ - if(!CdmStore.isActive()) { + if(!CdmStore.isActive() || getTermClass()==null) { return new ArrayList(); } 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 dfaa62d7a..ad6bbe9c6 100644 --- 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 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 566e9a736..78ffeae14 100644 --- 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 { /** {@inheritDoc} */ @Override protected Class getTermClass() { - return DefinedTerm.class; + return null; } } -- 2.34.1