fix #5821

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / preference / menu / AbstractMenuPreferences.java

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 43f3df9a9e69bdbb4b2ee233a62c59875af2bc0d..aa04200f5783a1a522f5a6c9ec7d58ba61529c2f 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
@@ -51,8 +51,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.TermStore;
 
 /**
- * <p>Abstract AbstractMenuPreferences class.</p>
- *
  * @author n.hoffmann
  * @created 12.06.2009
  * @version 1.0
@@ -145,9 +143,6 @@ public abstract class AbstractMenuPreferences<T extends DefinedTermBase> extends
                toggleButton = new Button(buttonContainer, SWT.PUSH);
                toggleButton.setText("Toggle");
                toggleButton.addSelectionListener(new SelectionAdapter(){
-                       /* (non-Javadoc)
-                        * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-                        */
                        @Override
                        public void widgetSelected(SelectionEvent e) {
                                state = state ? false : true;
@@ -161,12 +156,6 @@ public abstract class AbstractMenuPreferences<T extends DefinedTermBase> extends
                return container;
        }
 
-
-       /**
-        * <p>refresh</p>
-        *
-        * @param definedTerms a {@link java.util.List} object.
-        */
        protected void refresh(List<T> definedTerms) {
                tableViewer.setInput(definedTerms);
 
@@ -174,23 +163,10 @@ public abstract class AbstractMenuPreferences<T extends DefinedTermBase> extends
                tableViewer.setCheckedElements(preferedTerms.toArray());
        }
 
-       /**
-        * <p>createAdditionalContent</p>
-        *
-        * @param container a {@link org.eclipse.swt.widgets.Composite} object.
-        */
        protected void createAdditionalContent(Composite container) {
                // implement where needed
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.AbstractMenuPreferences#createButtons(org.eclipse.swt.widgets.Composite)
-        */
-       /**
-        * <p>createEditButtons</p>
-        *
-        * @param buttonContainer a {@link org.eclipse.swt.widgets.Composite} object.
-        */
        protected void createEditButtons(Composite buttonContainer) {
 
                editButton = new Button(buttonContainer, SWT.PUSH);
@@ -206,9 +182,6 @@ public abstract class AbstractMenuPreferences<T extends DefinedTermBase> extends
         */
        protected void addNewButtonListeners() {
                newButton.addSelectionListener(new SelectionAdapter(){
-                       /* (non-Javadoc)
-                        * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-                        */
                        @Override
                        public void widgetSelected(SelectionEvent e) {
                                VocabularyTermWizard<T> wizard = new VocabularyTermWizard<T>(getTermClass(), getConversationHolder());
@@ -219,7 +192,6 @@ public abstract class AbstractMenuPreferences<T extends DefinedTermBase> extends
                            }
                        }
 
-
                });
        }
 
@@ -229,9 +201,6 @@ public abstract class AbstractMenuPreferences<T extends DefinedTermBase> extends
         */
        protected void addEditButtonListeners() {
                editButton.addSelectionListener(new SelectionAdapter(){
-                       /* (non-Javadoc)
-                        * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-                        */
                        @Override
                        public void widgetSelected(SelectionEvent event) {
 
@@ -286,10 +255,6 @@ public abstract class AbstractMenuPreferences<T extends DefinedTermBase> extends
            }
        }
 
-       /*
-        * (non-Javadoc)
-        * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
-        */
        /**
         * <p>performDefaults</p>
         */
@@ -298,18 +263,10 @@ public abstract class AbstractMenuPreferences<T extends DefinedTermBase> extends
                tableViewer.setAllChecked(true);
        }
 
-       /**
-        * <p>Getter for the field <code>tableViewer</code>.</p>
-        *
-        * @return the tableViewer
-        */
        public CheckboxTableViewer getTableViewer() {
                return tableViewer;
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.jface.preference.PreferencePage#performOk()
-        */
        /** {@inheritDoc} */
        @Override
        public boolean performOk() {
@@ -330,6 +287,8 @@ public abstract class AbstractMenuPreferences<T extends DefinedTermBase> extends
 
                CdmStore.getTermManager().setPreferredTerms(preferredTerms, getTerms());
 
+               refresh(getTerms());
+
                PreferencesUtil.firePreferencesChanged(this.getClass());
 
 
@@ -347,16 +306,8 @@ public abstract class AbstractMenuPreferences<T extends DefinedTermBase> extends
                }
        }
 
-       /**
-        * <p>getTermClass</p>
-        *
-        * @return a {@link java.lang.Class} object.
-        */
        protected abstract Class<T> getTermClass();
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.api.conversation.IConversationEnabled#getConversationHolder()
-        */
        @Override
        public ConversationHolder getConversationHolder() {
                if(conversation == null){
@@ -365,9 +316,6 @@ public abstract class AbstractMenuPreferences<T extends DefinedTermBase> extends
                return conversation;
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.persistence.hibernate.ICdmPostDataChangeObserver#update(eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap)
-        */
        @Override
        public void update(CdmDataChangeMap changeEvents) {
                // implement where needed