From: Katja Luther <k.luther@bgbm.org>
Date: Mon, 29 Feb 2016 13:31:01 +0000 (+0100)
Subject: make restore of taxon navigator a preference
X-Git-Tag: 4.0.0^2~118
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/2b4683600c235f2a0a03812c413eea49946bec0f?hp=4a5178d364443f04065c5b095a5657a8bc6155f1

make restore of taxon navigator a preference
---

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigatorStateManager.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigatorStateManager.java
index c25b2af79..0ec7431c9 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigatorStateManager.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigatorStateManager.java
@@ -6,6 +6,8 @@ import org.eclipse.ui.IMemento;
 
 import eu.etaxonomy.taxeditor.model.ContextListenerAdapter;
 import eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigator;
+import eu.etaxonomy.taxeditor.preference.CdmPreferences;
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 
 /**
  * <p>NavigatorStateManager class.</p>
@@ -26,7 +28,12 @@ public class NavigatorStateManager extends ContextListenerAdapter {
 		TaxonNavigator navigator = NavigationUtil.getNavigator(true);
 		if(navigator != null){
 			navigator.init();
-			navigator.restore(memento, monitor);
+			if (PreferencesUtil.isStoreNavigatorState()){
+				navigator.restore(memento, monitor);
+			} else {
+				navigator.restore(null, monitor);
+			}
+			
 		}
 	}
 	
@@ -59,6 +66,7 @@ public class NavigatorStateManager extends ContextListenerAdapter {
 	@Override
 	public void workbenchShutdown(IMemento memento, IProgressMonitor monitor) {
 		saveNavigatorState(memento, monitor);
+	
 	}
 	
 	/**
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
index 57e7465ce..4b493063c 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
@@ -103,6 +103,8 @@ public interface IPreferenceKeys {
 	public static final String SORT_NODES_NATURALLY = "eu.etaxonomy.taxeditor.menus.sortNodesNaturally";
 	/** Constant <code>SORT_NODES_NATURALL="eu.etaxonomy.taxeditor.menus.sortNodesN"{trunked}</code> */
 	public static final String SORT_NODES_ALPHABETICALLY = "eu.etaxonomy.taxeditor.menus.sortNodesAlphabetically";
+	/** Constant <code>RESTORE_NAVIGATOR_STATE="eu.etaxonomy.taxeditor.taxonnavigator.restoreState"{trunked}</code> */
+	public static final String RESTORE_NAVIGATOR_STATE = "eu.etaxonomy.taxeditor.taxonnavigator.restoreState";
 	/**
 	 * Whether multilanguage text fields should be editable in multiple languages.
 	 */
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
index 1f9f25b26..3ece8622d 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
@@ -798,5 +798,31 @@ public class PreferencesUtil implements IPreferenceKeys {
 	public static void setSortNodesStrictlyAlphabetically(boolean selection) {
 		getPreferenceStore().setValue(SORT_NODES_ALPHABETICALLY, selection);
 	}
+
+	/**
+	 * <p>
+	 * setStoreNavigatorState
+	 * </p>
+	 *
+	 * @param selection
+	 *            a boolean.
+	 */
+	public static boolean isStoreNavigatorState() {
+		return getPreferenceStore().getBoolean(RESTORE_NAVIGATOR_STATE);
+		
+	}
+	
+	/**
+	 * <p>
+	 * setStoreNavigatorState
+	 * </p>
+	 *
+	 * @param selection
+	 *            a boolean.
+	 */
+	public static void setStoreNavigatorState(boolean selection) {
+		getPreferenceStore().setValue(RESTORE_NAVIGATOR_STATE, selection);
+		
+	}
 	
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java
index 9ec409300..62b86e423 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java
@@ -63,6 +63,9 @@ public class TaxonomicEditorGeneralPreferences extends
 	      addField(new BooleanFieldEditor(IPreferenceKeys.DISABLE_SERVICES_API_TIMESTAMP_CHECK,
 	                "Disable services api timestamp check",
 	                getFieldEditorParent()));
+	      addField(new BooleanFieldEditor(IPreferenceKeys.RESTORE_NAVIGATOR_STATE,
+	                "Restore the last Taxon Navigator state.",
+	                getFieldEditorParent()));
 	}
 
 	/*