ref #8489: fix set default for db term preferences
authorKatja Luther <k.luther@bgbm.org>
Thu, 29 Aug 2019 12:28:48 +0000 (14:28 +0200)
committerKatja Luther <k.luther@bgbm.org>
Thu, 29 Aug 2019 12:28:48 +0000 (14:28 +0200)
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralTermPreference.java

index c0eac52ed284ec9d89ff8c72753fc3d60e35ecce..f22aabb995c361e41df6739664af5a21f9a68fe2 100755 (executable)
@@ -164,9 +164,10 @@ abstract public class GeneralTermPreference extends CdmPreferencePage implements
 
     protected void rememberCheckedValues(String checkedValues) {
         initialiseVocabularies();
-
-        treeComposite.getViewer().setInput(getVocabularies());
         treeComposite.getViewer().getTree().deselectAll();
+        treeComposite.getViewer().refresh();
+        treeComposite.getViewer().setInput(getVocabularies());
+
         if (checkedValues != null && checkedValues != "") { //$NON-NLS-1$
             String[] listChecked = checkedValues.split(";"); //$NON-NLS-1$
             String[] listCheckedComma = checkedValues.split(","); //$NON-NLS-1$
@@ -183,6 +184,8 @@ abstract public class GeneralTermPreference extends CdmPreferencePage implements
         }else{
             List<AbstractTermDto> termsFromStringValues = getTermsFromStringValues(new ArrayList<String>());
             treeComposite.setCheckedElements(termsFromStringValues.toArray());
+            treeComposite.getViewer().refresh();
+            treeComposite.redraw();
 
         }
     }
@@ -273,7 +276,7 @@ abstract public class GeneralTermPreference extends CdmPreferencePage implements
 
     @Override
     protected void performDefaults(){
-        if (isAdminPreference){
+        if (!isLocalPref()){
             rememberCheckedValues("");
             treeComposite.setEnabled(true);
         }else{