fix restore default for default feature tree preference

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java
index 3a0085abba84a5b87f8cd3e2cd4e0a09f5dec79b..e2f1d193e29380922d44f1a4784d2fb3426a071a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java
@@ -42,6 +42,9 @@ public class DefaultFeatureTreePreferenecs extends CdmPreferencePage {
 
        private TermTree defaultFeatureTreeForTextualDescription;
        private TermTree defaultFeatureTreeForStructuredDescription;
+       
+       private ListViewer viewerText;
+       private  ListViewer viewerStructure;
 
        /** {@inheritDoc} */
        @Override
@@ -64,20 +67,20 @@ public class DefaultFeatureTreePreferenecs extends CdmPreferencePage {
        private void createTextTreeSelection(Composite parent){
                final CLabel label = new CLabel(parent, SWT.NONE);
                label.setText(Messages.DefaultFeatureTreePreferenecs_0);
+               viewerText = new ListViewer(parent, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
+               
+               viewerText.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
-               final ListViewer viewer = new ListViewer(parent, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-               viewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+               viewerText.setContentProvider(new TermTreeContentProvider());
+               viewerText.setLabelProvider(new TermTreeLabelProvider());
 
-               viewer.setContentProvider(new TermTreeContentProvider());
-               viewer.setLabelProvider(new TermTreeLabelProvider());
-
-               viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+               viewerText.addSelectionChangedListener(new ISelectionChangedListener() {
 
                        @Override
                        public void selectionChanged(SelectionChangedEvent arg0) {
                            setApply(true);
 //                         viewer.setSelection(arg0.getSelection());
-                               IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
+                               IStructuredSelection selection = (IStructuredSelection) viewerText.getSelection();
 
                                defaultFeatureTreeForTextualDescription = (TermTree)selection.getFirstElement();
 
@@ -86,11 +89,11 @@ public class DefaultFeatureTreePreferenecs extends CdmPreferencePage {
 
                List<TermTree> input = CdmStore.getService(ITermTreeService.class).list(TermTree.class, null, null, null, null);
 
-               viewer.setInput(input);
+               viewerText.setInput(input);
 
                if(defaultFeatureTreeForTextualDescription != null){
                        IStructuredSelection selection = new StructuredSelection(defaultFeatureTreeForTextualDescription);
-                       viewer.setSelection(selection, true);
+                       viewerText.setSelection(selection, true);
                }
        }
 
@@ -98,20 +101,20 @@ public class DefaultFeatureTreePreferenecs extends CdmPreferencePage {
                final CLabel label = new CLabel(parent, SWT.NONE);
                label.setText(Messages.DefaultFeatureTreePreferenecs_1);
 
-               final ListViewer viewer = new ListViewer(parent, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
+               viewerStructure = new ListViewer(parent, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
 
-               viewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+               viewerStructure.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
-               viewer.setContentProvider(new TermTreeContentProvider());
-               viewer.setLabelProvider(new TermTreeLabelProvider());
+               viewerStructure.setContentProvider(new TermTreeContentProvider());
+               viewerStructure.setLabelProvider(new TermTreeLabelProvider());
 
-               viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+               viewerStructure.addSelectionChangedListener(new ISelectionChangedListener() {
 
                        @Override
                        public void selectionChanged(SelectionChangedEvent arg0) {
                            setApply(true);
 //                         viewer.setSelection(arg0.getSelection());
-                               IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
+                               IStructuredSelection selection = (IStructuredSelection) viewerStructure.getSelection();
 
                                defaultFeatureTreeForStructuredDescription = (TermTree) selection.getFirstElement();
 
@@ -120,11 +123,11 @@ public class DefaultFeatureTreePreferenecs extends CdmPreferencePage {
 
                List<TermTree> input = CdmStore.getService(ITermTreeService.class).list(TermTree.class, null, null, null, null);
 
-               viewer.setInput(input);
+               viewerStructure.setInput(input);
 
                if(defaultFeatureTreeForStructuredDescription != null){
                        IStructuredSelection selection = new StructuredSelection(defaultFeatureTreeForStructuredDescription);
-                       viewer.setSelection(selection, true);
+                       viewerStructure.setSelection(selection, true);
                }
        }
 
@@ -146,4 +149,14 @@ public class DefaultFeatureTreePreferenecs extends CdmPreferencePage {
 
                return super.performOk();
        }
+       @Override
+    protected void performDefaults() {
+               defaultFeatureTreeForTextualDescription = null;
+               defaultFeatureTreeForTextualDescription = null;
+               viewerStructure.setSelection(null);
+               viewerText.setSelection(null);
+        setApply(true);
+        super.performDefaults();
+    }
+
 }