fix #9168: after changing preference preferredFeatureTree should be updated - continue

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java
index f5a27aef2d84b1006959f07506be936e9ad69d77..1abafcee024cb23515e3160bef0372b19a4df544 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java
@@ -128,7 +128,7 @@ public class TermEditorInput extends AbstractDefinedTermEditorInput<DefinedTerm>
 //            TermVocabulary voc = CdmStore.getService(IVocabularyService.class).load(VocabularyEnum.NameFeature.getUuid());
 //            List<Feature> nameFeatures = new ArrayList(voc.getTerms());
 //            nameFeatures.remove(Feature.PROTOLOGUE());
-            PreferencesUtil.createPreferredFeatureTreeForNameDescription();
+//            PreferencesUtil.createPreferredFeatureTreeForNameDescription();
             defaultNameFeatureTree = PreferencesUtil.getPreferredFeatureTreeForNameDescription(true);
           //List<Feature> nameFeatures = CdmStore.getTermManager().getPreferredTerms(CdmStore.getService(IVocabularyService.class).load(VocabularyEnum.NameFeature.getUuid()), null);
 //            defaultNameFeatureTree = TermTree.NewInstance(nameFeatures);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameFeatureMenuPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameFeatureMenuPreference.java
index 9cabb81b8459b86d3f67e56d7478624967375cab..aa9f52f7f3194f68613ec43de90b766915e16e04 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameFeatureMenuPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameFeatureMenuPreference.java
@@ -15,7 +15,10 @@ import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
+import javax.inject.Inject;
+
 import org.apache.commons.lang.StringUtils;
+import org.eclipse.e4.core.services.events.IEventBroker;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.GridData;
@@ -34,7 +37,6 @@ import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto;
 import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermSorter;
 import eu.etaxonomy.taxeditor.editor.definedterm.FeatureDtoContentProvider;
 import eu.etaxonomy.taxeditor.editor.definedterm.TermDtoLabelProvider;
-import eu.etaxonomy.taxeditor.editor.definedterm.input.TermEditorInput;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.preference.GeneralTermPreferencePage;
 import eu.etaxonomy.taxeditor.preference.LocalOrDefaultEnum;
@@ -51,6 +53,8 @@ public class NameFeatureMenuPreference extends GeneralTermPreferencePage {
     /** Constant <code>PLUGIN_ID="eu.etaxonomy.taxeditor.preferences.feat"{trunked}</code> */
     public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.preferences.nameFeature"; //$NON-NLS-1$
 
+    @Inject
+    private IEventBroker eventBroker;
     /**
      * <p>Constructor for NameFeatureMenuPreference.</p>
      */
@@ -126,8 +130,7 @@ public class NameFeatureMenuPreference extends GeneralTermPreferencePage {
         if (isApply()){
             boolean result = super.performOk();
             if (result){
-                PreferencesUtil.createPreferredFeatureTreeForNameDescription();
-                TermEditorInput.resetDefaultNameFeatureTree();
+                PreferencesUtil.getPreferredFeatureTreeForNameDescription(true);
             }
         }
         return true;