BGBM BDI Projects / taxeditor.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
adapt master to develop
[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / preference / GeneralPreferencePage.java
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java
old mode 100755 (executable)
new mode 100644 (file)
index caa9bcc..92cb11a
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java
@@ -33,31 +33,17 @@ import eu.etaxonomy.taxeditor.preference.menu.CdmPreferencePage;
  */
 public class GeneralPreferencePage extends CdmPreferencePage implements SelectionListener{
 
-
-    protected Boolean isShowIOMenu;
-//    protected boolean isShowMediaView;
     protected Boolean isShowCheckListPerspective;
-    protected Boolean isShowTaxonNodeWizard;
-    protected boolean isAllowOverrideShowIOMenu;
+
     protected boolean isAllowOverrideShowMediaView;
     protected boolean isAllowOverrideShowCheckListPerspective;
-    protected boolean isAllowOverrideShowTaxonNodeWizard;
-    protected boolean isOverrideShowIOMenu;
+
     protected boolean isOverrideShowMediaView;
     protected boolean isOverrideShowCheckListPerspective;
-    protected boolean isOverrideShowTaxonNodeWizard;
 
-    protected Combo showIOMenuButton;
-    protected Button allowOverrideShowIOMenuButton;
     protected Combo showChecklistPerspectiveButton;
     protected Button allowOverrideShowChecklistButton;
-    protected Combo showTaxonNodeWizardButton;
-    protected Button allowOverrideShowTaxonNodeWizardButton;
-    final String SHOW = Messages.GeneralPreference_yes;
-    final String DO_NOT_SHOW = Messages.GeneralPreference_no;
-    /**
-     * {@inheritDoc}
-     */
+
     @Override
     protected Control createContents(Composite parent) {
         getValues();
@@ -69,24 +55,6 @@ public class GeneralPreferencePage extends CdmPreferencePage implements Selectio
         separator.setLayoutData(gridData);
         separator.setVisible(false);
 
-        showIOMenuButton = createBooleanCombo(composite, SHOW, DO_NOT_SHOW, PreferencePredicate.ShowImportExportMenu, "Show Export/Import Menu",
-                isAdminPreference);
-
-        showIOMenuButton.addSelectionListener(this);
-
-
-        if (isAdminPreference){
-        allowOverrideShowIOMenuButton = createAllowOverrideButton(composite);
-
-
-            allowOverrideShowIOMenuButton.addSelectionListener(new SelectionAdapter(){
-                @Override
-                public void widgetSelected(SelectionEvent e) {
-                    isAllowOverrideShowIOMenu = allowOverrideShowIOMenuButton.getSelection();
-                    setApply(true);
-                }
-            });
-        }
 
 
         showChecklistPerspectiveButton = createBooleanCombo(composite, SHOW, DO_NOT_SHOW, PreferencePredicate.ShowChecklistPerspective, "Set Checklist Perspective as Default Perspective",
@@ -106,37 +74,6 @@ public class GeneralPreferencePage extends CdmPreferencePage implements Selectio
             });
         }
 
-        showTaxonNodeWizardButton = createBooleanCombo(composite, SHOW, DO_NOT_SHOW, PreferencePredicate.ShowTaxonNodeWizard, "Show Taxonnode Wizard",
-                isAdminPreference);
-        showTaxonNodeWizardButton.setText(Messages.DatabasePreferncesPage_Show_TaxonNodeWizard);
-        showTaxonNodeWizardButton.addSelectionListener(this);
-
-
-        if (isAdminPreference){
-            allowOverrideShowTaxonNodeWizardButton = createAllowOverrideButton(composite);
-            allowOverrideShowTaxonNodeWizardButton.addSelectionListener(new SelectionAdapter(){
-                @Override
-                public void widgetSelected(SelectionEvent e) {
-                    isAllowOverrideShowTaxonNodeWizard = allowOverrideShowTaxonNodeWizardButton.getSelection();
-                    setApply(true);
-                }
-            });
-        }
-        if(!isAdminPreference){
-            if (!isAllowOverrideShowIOMenu){
-                showIOMenuButton.setEnabled(false);
-
-            }
-            if (!isAllowOverrideShowCheckListPerspective){
-                showChecklistPerspectiveButton.setEnabled(false);
-
-            }
-            if (!isAllowOverrideShowTaxonNodeWizard){
-                showTaxonNodeWizardButton.setEnabled(false);
-
-            }
-        }
-
         setSelections();
         return composite;
     }
@@ -156,100 +93,38 @@ public class GeneralPreferencePage extends CdmPreferencePage implements Selectio
 
 
         }
-        if (isAllowOverrideShowIOMenu){
-            if (isShowIOMenu != null){
-                PreferencesUtil.setBooleanValue(PreferencePredicate.ShowImportExportMenu.getKey(), isShowIOMenu);
-            }
-            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowImportExportMenu.getKey()), isOverrideShowIOMenu);
-        }
-
-        if (isAllowOverrideShowTaxonNodeWizard){
-            if (isShowTaxonNodeWizard != null){
-                PreferencesUtil.setBooleanValue(PreferencePredicate.ShowTaxonNodeWizard.getKey(), isShowTaxonNodeWizard);
-            }
-            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowTaxonNodeWizard.getKey()), isOverrideShowTaxonNodeWizard);
-
-        }
+        return true;
+    }
 
-       return true;
-   }
     @Override
     protected void getValues(){
         isAdminPreference = false;
 
         CdmPreferenceCache cache = CdmPreferenceCache.instance();
-        isOverrideShowIOMenu = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowImportExportMenu.getKey()), true) != null?
-                PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowImportExportMenu.getKey()), true): false;
-        if (isOverrideShowIOMenu){
-            isShowIOMenu = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowImportExportMenu.getKey(), true);
-        }
-
-
-        PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowImportExportMenu);
-        CdmPreference pref = cache.findBestMatching(key);
-        if (pref != null){
-            isAllowOverrideShowIOMenu = pref.isAllowOverride();
-        }else{
-            isAllowOverrideShowIOMenu = true;
-        }
-
         isOverrideShowCheckListPerspective = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowChecklistPerspective.getKey()), true) != null? PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowChecklistPerspective.getKey()), true): false;
         if (isOverrideShowCheckListPerspective){
             isShowCheckListPerspective = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowChecklistPerspective.getKey(), true);
         }
 
-
-        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowChecklistPerspective);
-        pref = cache.findBestMatching(key);
+        PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowChecklistPerspective);
+        CdmPreference pref = cache.findBestMatching(key);
         if (pref != null){
             isAllowOverrideShowCheckListPerspective = pref.isAllowOverride();
         }else{
             isAllowOverrideShowCheckListPerspective = true;
         }
 
-        isOverrideShowTaxonNodeWizard = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowTaxonNodeWizard.getKey()), true) != null? PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowTaxonNodeWizard.getKey()), true): false;
-        if (isOverrideShowTaxonNodeWizard){
-            isShowTaxonNodeWizard = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowTaxonNodeWizard.getKey(), true);
-        }
 
-        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowTaxonNodeWizard);
-        pref = cache.findBestMatching(key);
-        if (pref != null){
-            isAllowOverrideShowTaxonNodeWizard = pref.isAllowOverride();
-        }else{
-            isAllowOverrideShowTaxonNodeWizard = true;
-        }
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void widgetSelected(SelectionEvent e) {
-
-        if (e.getSource().equals(this.showIOMenuButton)) {
-            String text = showIOMenuButton.getText();
-            if (text.startsWith(Messages.Preference_Use_Default)){
-                isOverrideShowIOMenu = false;
-                isShowIOMenu = null;
-                isAllowOverrideShowIOMenu = true;
-            }else if (text.equals(SHOW)){
-                isShowIOMenu = true;
-                isOverrideShowIOMenu = true;
-
-            }else{
-                isShowIOMenu = false;
-                isOverrideShowIOMenu = true;
-            }
-        }
         if (e.getSource().equals(this.showChecklistPerspectiveButton)) {
             String text = showChecklistPerspectiveButton.getText();
             if (text.startsWith(Messages.Preference_Use_Default)){
                 isOverrideShowCheckListPerspective = false;
                 isShowCheckListPerspective = null;
-                isAllowOverrideShowCheckListPerspective = true;
+
             }else if (text.equals(SHOW)){
                 isShowCheckListPerspective = true;
                 isOverrideShowCheckListPerspective = true;
@@ -258,20 +133,7 @@ public class GeneralPreferencePage extends CdmPreferencePage implements Selectio
                 isOverrideShowCheckListPerspective = true;
             }
         }
-        if (e.getSource().equals(this.showTaxonNodeWizardButton)) {
-            String text = showTaxonNodeWizardButton.getText();
-            if (text.startsWith(Messages.Preference_Use_Default)){
-                isOverrideShowTaxonNodeWizard = false;
-                isShowTaxonNodeWizard = null;
-                isAllowOverrideShowTaxonNodeWizard = true;
-            }else if (text.equals(SHOW)){
-                isShowTaxonNodeWizard = true;
-                isOverrideShowTaxonNodeWizard = true;
-            }else{
-                isShowTaxonNodeWizard = false;
-                isOverrideShowTaxonNodeWizard = true;
-            }
-        }
+
         this.setSelections();
         this.setApply(true);
 
@@ -291,44 +153,17 @@ public class GeneralPreferencePage extends CdmPreferencePage implements Selectio
 
     @Override
     protected void performDefaults() {
-        isOverrideShowTaxonNodeWizard = false;
-        isShowTaxonNodeWizard = null;
-
         isOverrideShowCheckListPerspective = false;
         isShowCheckListPerspective = null;
 
-        isOverrideShowIOMenu = false;
-        isShowIOMenu = null;
         setSelections();
         setApply(true);
     }
 
     protected void setSelections(){
-        if (isShowIOMenu == null || (!isOverrideShowIOMenu && !isAdminPreference)){
-            showIOMenuButton.select(0);
-            if (isAdminPreference){
-                allowOverrideShowIOMenuButton.setEnabled(false);
-            }
-        }else{
-            if (isAdminPreference){
-                allowOverrideShowIOMenuButton.setEnabled(true);
-            }
-            if (isShowIOMenu){
-                showIOMenuButton.select(1);
-            }else{
-                showIOMenuButton.select(2);
-            }
-        }
-
         if (isShowCheckListPerspective == null || (!isOverrideShowCheckListPerspective && !isAdminPreference)){
             showChecklistPerspectiveButton.select(0);
-            if (isAdminPreference){
-                allowOverrideShowChecklistButton.setEnabled(false);
-            }
         }else{
-            if (isAdminPreference){
-                allowOverrideShowChecklistButton.setEnabled(true);
-            }
             if (isShowCheckListPerspective){
                 showChecklistPerspectiveButton.select(1);
             }else{
@@ -336,26 +171,8 @@ public class GeneralPreferencePage extends CdmPreferencePage implements Selectio
             }
         }
 
-        if (isShowTaxonNodeWizard == null || (!isOverrideShowTaxonNodeWizard && !isAdminPreference)){
-            showTaxonNodeWizardButton.select(0);
-            if (isAdminPreference){
-                allowOverrideShowTaxonNodeWizardButton.setEnabled(false);
-            }
-        }else{
-            if (isAdminPreference){
-                allowOverrideShowTaxonNodeWizardButton.setEnabled(true);
-            }
-            if (isShowTaxonNodeWizard){
-                showTaxonNodeWizardButton.select(1);
-            }else{
-                showTaxonNodeWizardButton.select(2);
-            }
-        }
-
         if (isAdminPreference){
-            allowOverrideShowIOMenuButton.setSelection(isAllowOverrideShowIOMenu);
             allowOverrideShowChecklistButton.setSelection(isAllowOverrideShowCheckListPerspective);
-            allowOverrideShowTaxonNodeWizardButton.setSelection(isAllowOverrideShowTaxonNodeWizard);
         }
     }