ref #7849: update name details page when restore default

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameDetailsViewAdminConfiguration.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameDetailsViewAdminConfiguration.java
index 6a397539ef324241feb2f007940dd3a2dea1b2d3..5116493d8bba9b691ce1ad57de1a2692a4a39709 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameDetailsViewAdminConfiguration.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameDetailsViewAdminConfiguration.java
@@ -111,6 +111,7 @@ public class NameDetailsViewAdminConfiguration extends NameDetailsViewConfigurat
         isSecEnabled = nameDetailsConfig.isSecEnabled();
         isShowTypeDesignation = nameDetailsConfig.isTypeDesignationSectionActivated();
         isShowHybrid = nameDetailsConfig.isHybridActivated();
+        this.setButtonSelections();
         super.performDefaults();
     }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
index cac401181e6d703f51852e00dc08fd5f4fca2991..90e8c3bf7b356d181a0f4f045c68c255f79ac554 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
@@ -51,6 +51,25 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
     private Button showSecDetail;
     private Button secEnabled;
 
+    protected Button activateCheckButton;
+    protected Button allowLocalPreference;
+    protected Button showTaxon;
+    protected Button showLsid;
+    protected Button showNomenclaturalCode;
+    protected Button showNameCache;
+    protected Button showAppendedPhrase;
+    protected Button showRank;
+    protected Button showEpithets;
+    protected Button showAuthorCache;
+    protected Button showAuthorship;
+    protected Button showNomenclaturalRef;
+    protected Button showNomenclaturalStatus;
+    protected Button showProtologue;
+    protected Button showTypeDesignation;
+    protected Button showNameRelationship;
+    protected Button showHybrid;
+    protected Button showNameApprobiation;
+
     @Override
     protected Control createContents(Composite parent) {
         getValues();
@@ -65,14 +84,14 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
                 nameDetailsConfig = new NameDetailsConfigurator(false);
             }
 
-            final Button activateCheckButton = new Button(title, SWT.CHECK);
-            final Button allowLocalPreference = createAllowOverrideButton(title);
+            activateCheckButton = new Button(title, SWT.CHECK);
+            allowLocalPreference = createAllowOverrideButton(title);
             Composite dbSettings  = new Composite(parent, SWT.NONE);
 
             activateCheckButton.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, true, 1, 1));
             activateCheckButton.setText(Messages.NameDetailsViewConfiguration_activateSimpleDetailsView);
             isSimpleDetailsViewActivated = nameDetailsConfig.isSimpleDetailsViewActivated();
-            activateCheckButton.setSelection(isSimpleDetailsViewActivated);
+
             activateCheckButton.addSelectionListener(new SelectionAdapter(){
                 @Override
                 public void widgetSelected(SelectionEvent e) {
@@ -89,11 +108,7 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
                  }
              });
 
-            if (isAdminPreference){
-                allowLocalPreference.setSelection(isAllowOverride);
-            }else{
-                allowLocalPreference.setSelection(isOverride);
-            }
+
             allowLocalPreference.addSelectionListener(new SelectionAdapter(){
                 @Override
                 public void widgetSelected(SelectionEvent e) {
@@ -113,10 +128,10 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
 
             Label separator= new Label(dbSettings, SWT.HORIZONTAL | SWT.SEPARATOR);
             separator.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-            final Button showTaxon = new Button(dbSettings, SWT.CHECK);
+            showTaxon = new Button(dbSettings, SWT.CHECK);
             showTaxon.setText(Messages.NameDetailsViewComposite_Show_Taxon);
             isShowTaxon = nameDetailsConfig.isTaxonSectionActivated();
-            showTaxon.setSelection(isShowTaxon);
+
             showTaxon.addSelectionListener(new SelectionAdapter(){
                  @Override
                  public void widgetSelected(SelectionEvent e) {
@@ -144,7 +159,7 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
             secEnabled.setText(Messages.NameDetailsViewComposite_SecEnabled);
 
             isSecEnabled = nameDetailsConfig.isSecEnabled();
-            secEnabled.setSelection(isSecEnabled);
+
             secEnabled.addSelectionListener(new SelectionAdapter(){
                  @Override
                  public void widgetSelected(SelectionEvent e) {
@@ -157,7 +172,7 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
             showSecDetail.setText(Messages.NameDetailsViewComposite_Show_SecDetail);
 
             isSecDetailsActivated = nameDetailsConfig.isSecDetailsActivated();
-            showSecDetail.setSelection(isSecDetailsActivated);
+
             showSecDetail.addSelectionListener(new SelectionAdapter(){
                  @Override
                  public void widgetSelected(SelectionEvent e) {
@@ -167,10 +182,10 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
                   }
              });
 
-            final Button showLsid = new Button(dbSettings, SWT.CHECK);
+            showLsid = new Button(dbSettings, SWT.CHECK);
             showLsid.setText(Messages.NameDetailsViewComposite_Show_LSID);
             isShowLSID = nameDetailsConfig.isLSIDActivated();
-            showLsid.setSelection(isShowLSID);
+
             showLsid.addSelectionListener(new SelectionAdapter(){
                  @Override
                  public void widgetSelected(SelectionEvent e) {
@@ -180,10 +195,10 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
                   }
              });
 
-            final Button showNomenclaturalCode = new Button(dbSettings, SWT.CHECK);
+            showNomenclaturalCode = new Button(dbSettings, SWT.CHECK);
             showNomenclaturalCode.setText(Messages.NameDetailsViewComposite_Show_NomenclaturalCode);
             isShowNomenclaturalCode = nameDetailsConfig.isNomenclaturalCodeActived();
-            showNomenclaturalCode.setSelection(isShowNomenclaturalCode);
+
             showNomenclaturalCode.addSelectionListener(new SelectionAdapter(){
                  @Override
                  public void widgetSelected(SelectionEvent e) {
@@ -193,10 +208,10 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
                   }
              });
 
-            final Button showNameCache = new Button(dbSettings, SWT.CHECK);
+            showNameCache = new Button(dbSettings, SWT.CHECK);
             showNameCache.setText(Messages.NameDetailsViewComposite_Show_NameCache);
             isShowNameCache = nameDetailsConfig.isNameCacheActivated();
-            showNameCache.setSelection(isShowNameCache);
+
             showNameCache.addSelectionListener(new SelectionAdapter(){
                  @Override
                  public void widgetSelected(SelectionEvent e) {
@@ -205,10 +220,10 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
                      nameDetailsConfig.setNameCacheActivated(isShowNameCache);
                   }
              });
-            final Button showAppendedPhrase = new Button(dbSettings, SWT.CHECK);
+            showAppendedPhrase = new Button(dbSettings, SWT.CHECK);
             isShowAppendedPhrase= nameDetailsConfig.isAppendedPhraseActivated();
             showAppendedPhrase.setText(Messages.NameDetailsViewComposite_Show_AppendedPhrase);
-            showAppendedPhrase.setSelection(isShowAppendedPhrase);
+
             showAppendedPhrase.addSelectionListener(new SelectionAdapter(){
                  @Override
                  public void widgetSelected(SelectionEvent e) {
@@ -218,10 +233,10 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
                   }
              });
 
-            final Button showRank = new Button(dbSettings, SWT.CHECK);
+            showRank = new Button(dbSettings, SWT.CHECK);
             isShowRank = nameDetailsConfig.isRankActivated();
             showRank.setText(Messages.NameDetailsViewComposite_Show_Rank);
-            showRank.setSelection(isShowRank);
+
             showRank.addSelectionListener(new SelectionAdapter(){
                  @Override
                  public void widgetSelected(SelectionEvent e) {
@@ -230,10 +245,10 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
                      nameDetailsConfig.setRankActivated(isShowRank);
                   }
              });
-            final Button showEpithets = new Button(dbSettings, SWT.CHECK);
+            showEpithets = new Button(dbSettings, SWT.CHECK);
             isShowEpithets = nameDetailsConfig.isAtomisedEpithetsActivated();
             showEpithets.setText(Messages.NameDetailsViewComposite_Show_AtomisedEpithets);
-            showEpithets.setSelection(isShowEpithets);
+
             showEpithets.addSelectionListener(new SelectionAdapter(){
                  @Override
                  public void widgetSelected(SelectionEvent e) {
@@ -243,10 +258,10 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
                   }
              });
 
-            final Button showAuthorCache = new Button(dbSettings, SWT.CHECK);
+            showAuthorCache = new Button(dbSettings, SWT.CHECK);
             isShowAuthorCache = nameDetailsConfig.isAuthorCacheActivated();
             showAuthorCache.setText(Messages.NameDetailsViewComposite_Show_AuthorCache);
-            showAuthorCache.setSelection(isShowAuthorCache);
+
             showAuthorCache.addSelectionListener(new SelectionAdapter(){
                  @Override
                  public void widgetSelected(SelectionEvent e) {
@@ -256,10 +271,10 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
                   }
              });
 
-            final Button showAuthorship = new Button(dbSettings, SWT.CHECK);
+            showAuthorship = new Button(dbSettings, SWT.CHECK);
             isShowAuthorship = nameDetailsConfig.isAuthorshipSectionActivated();
             showAuthorship.setText(Messages.NameDetailsViewComposite_Show_Author);
-            showAuthorship.setSelection(isShowAuthorship);
+
             showAuthorship.addSelectionListener(new SelectionAdapter(){
                  @Override
                  public void widgetSelected(SelectionEvent e) {
@@ -269,10 +284,10 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
                   }
              });
 
-            final Button showNomenclaturalRef = new Button(dbSettings, SWT.CHECK);
+            showNomenclaturalRef = new Button(dbSettings, SWT.CHECK);
             isShowNomenclaturalRef = nameDetailsConfig.isNomenclaturalReferenceSectionActivated();
             showNomenclaturalRef.setText(Messages.NameDetailsViewComposite_Show_NomenclaturalReference);
-            showNomenclaturalRef.setSelection(isShowNomenclaturalRef);
+
             showNomenclaturalRef.addSelectionListener(new SelectionAdapter(){
                  @Override
                  public void widgetSelected(SelectionEvent e) {
@@ -282,10 +297,10 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
                   }
              });
 
-            final Button showNomenclaturalStatus = new Button(dbSettings, SWT.CHECK);
+            showNomenclaturalStatus = new Button(dbSettings, SWT.CHECK);
             isShowNomenclaturalStatus = nameDetailsConfig.isNomenclaturalStatusSectionActivated();
             showNomenclaturalStatus.setText(Messages.NameDetailsViewComposite_Show_NomenclaturalStatus);
-            showNomenclaturalStatus.setSelection(isShowNomenclaturalStatus);
+
             showNomenclaturalStatus.addSelectionListener(new SelectionAdapter(){
                  @Override
                  public void widgetSelected(SelectionEvent e) {
@@ -295,10 +310,10 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
                   }
              });
 
-            final Button showProtologue = new Button(dbSettings, SWT.CHECK);
+            showProtologue = new Button(dbSettings, SWT.CHECK);
             isShowProtologue = nameDetailsConfig.isProtologueActivated();
             showProtologue.setText(Messages.NameDetailsViewComposite_Show_Protologue);
-            showProtologue.setSelection(isShowProtologue);
+
             showProtologue.addSelectionListener(new SelectionAdapter(){
                  @Override
                  public void widgetSelected(SelectionEvent e) {
@@ -308,10 +323,10 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
                   }
              });
 
-            final Button showTypeDesignation = new Button(dbSettings, SWT.CHECK);
+            showTypeDesignation = new Button(dbSettings, SWT.CHECK);
             isShowTypeDesignation = nameDetailsConfig.isTypeDesignationSectionActivated();
             showTypeDesignation.setText(Messages.NameDetailsViewComposite_Show_TypeDesignation);
-            showTypeDesignation.setSelection(isShowTypeDesignation);
+
             showTypeDesignation.addSelectionListener(new SelectionAdapter(){
                  @Override
                  public void widgetSelected(SelectionEvent e) {
@@ -322,10 +337,10 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
              });
 
 
-            final Button showNameRelationship = new Button(dbSettings, SWT.CHECK);
+            showNameRelationship = new Button(dbSettings, SWT.CHECK);
             isShowNameRelationship = nameDetailsConfig.isNameRelationsSectionActivated();
             showNameRelationship.setText(Messages.NameDetailsViewComposite_Show_Namerelationships);
-            showNameRelationship.setSelection(isShowNameRelationship);
+
             showNameRelationship.addSelectionListener(new SelectionAdapter(){
                  @Override
                  public void widgetSelected(SelectionEvent e) {
@@ -335,10 +350,10 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
                   }
              });
 
-            final Button showHybrid = new Button(dbSettings, SWT.CHECK);
+            showHybrid = new Button(dbSettings, SWT.CHECK);
             isShowHybrid = nameDetailsConfig.isHybridActivated();
             showHybrid.setText(Messages.NameDetailsViewComposite_Show_Hybrid);
-            showHybrid.setSelection(isShowHybrid);
+
             showHybrid.addSelectionListener(new SelectionAdapter(){
                  @Override
                  public void widgetSelected(SelectionEvent e) {
@@ -347,10 +362,9 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
                      nameDetailsConfig.setHybridActivated(isShowHybrid);
                   }
              });
-            final Button showNameApprobiation = new Button(dbSettings, SWT.CHECK);
+            showNameApprobiation = new Button(dbSettings, SWT.CHECK);
             isShowNameApprobiation = nameDetailsConfig.isNameApprobiationActivated();
             showNameApprobiation.setText(Messages.NameDetailsViewComposite_Show_NameApprobiation);
-            showNameApprobiation.setSelection(isShowNameApprobiation);
             showNameApprobiation.addSelectionListener(new SelectionAdapter(){
                  @Override
                  public void widgetSelected(SelectionEvent e) {
@@ -364,6 +378,7 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
                 showSecDetail.setEnabled(isShowTaxon);
                 secEnabled.setEnabled(isShowTaxon);
             }
+            setButtonSelections();
 
         }else{
             final CLabel description = new CLabel(parent, SWT.NULL);
@@ -402,4 +417,59 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
         }
     }
 
+    protected void setButtonSelections(){
+        activateCheckButton.setSelection(isSimpleDetailsViewActivated);;
+        if (isAdminPreference){
+            allowLocalPreference.setSelection(isAllowOverride);
+        }else{
+            allowLocalPreference.setSelection(isOverride);
+        }
+        showTaxon.setSelection(isShowTaxon);
+        showLsid.setSelection(isShowLSID);
+        showNomenclaturalCode.setSelection(isShowNomenclaturalCode);
+        showNameCache.setSelection(isShowNameCache);
+        showAppendedPhrase.setSelection(isShowAppendedPhrase);
+        showRank.setSelection(isShowRank);
+        showEpithets.setSelection(isShowEpithets);
+        showAuthorCache.setSelection(isShowAuthorCache);
+        showAuthorship.setSelection(isShowAuthorship);
+        showNomenclaturalRef.setSelection(isShowNomenclaturalRef);
+        showNomenclaturalStatus.setSelection(isShowNomenclaturalStatus);
+        showProtologue.setSelection(isShowProtologue);
+        showTypeDesignation.setSelection(isShowTypeDesignation);
+        showNameRelationship.setSelection(isShowNameRelationship);
+        showHybrid.setSelection(isShowHybrid);
+        showNameApprobiation.setSelection(isShowNameApprobiation);
+        secEnabled.setSelection(isSecEnabled);
+        secEnabled.setEnabled(isShowTaxon);
+        showSecDetail.setSelection(isSecDetailsActivated);
+        showSecDetail.setEnabled(isShowTaxon);
+
+    }
+
+    @Override
+    protected void performDefaults() {
+        nameDetailsConfig = new NameDetailsConfigurator(false);
+        isShowAppendedPhrase = nameDetailsConfig.isAppendedPhraseActivated();
+        isShowEpithets = nameDetailsConfig.isAtomisedEpithetsActivated();
+        isShowAuthorship = nameDetailsConfig.isAuthorshipSectionActivated();
+        isShowAuthorCache = nameDetailsConfig.isAuthorCacheActivated();
+        isShowLSID = nameDetailsConfig.isLSIDActivated();
+        isShowNameApprobiation = nameDetailsConfig.isNameApprobiationActivated();
+        isShowNameCache = nameDetailsConfig.isNameCacheActivated();
+        isShowNameRelationship = nameDetailsConfig.isNameRelationsSectionActivated();
+        isShowNomenclaturalCode = nameDetailsConfig.isNomenclaturalCodeActived();
+        isShowNomenclaturalStatus = nameDetailsConfig.isNomenclaturalStatusSectionActivated();
+        isShowNomenclaturalRef = nameDetailsConfig.isNomenclaturalReferenceSectionActivated();
+        isShowProtologue = nameDetailsConfig.isProtologueActivated();
+        isShowRank = nameDetailsConfig.isRankActivated();
+        isShowTaxon = nameDetailsConfig.isTaxonSectionActivated();
+        isSecDetailsActivated = nameDetailsConfig.isSecDetailsActivated();
+        isSecEnabled = nameDetailsConfig.isSecEnabled();
+        isShowTypeDesignation = nameDetailsConfig.isTypeDesignationSectionActivated();
+        isShowHybrid = nameDetailsConfig.isHybridActivated();
+        this.setButtonSelections();
+        super.performDefaults();
+    }
+
 }