missing changes

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
index 6e6b00bb337b1540bac17bab4ea137d30e4216cf..2473eb9aec18ff1f9004c2423bcf4b0117700dfd 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
@@ -30,9 +30,11 @@ import org.eclipse.ui.PlatformUI;
 import eu.etaxonomy.cdm.api.application.CdmApplicationState;
 import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
 import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor;
+import eu.etaxonomy.cdm.io.common.CacheUpdaterConfigurator;
 import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE;
+import eu.etaxonomy.cdm.io.common.ImportConfiguratorBase;
 import eu.etaxonomy.cdm.io.common.ImportResult;
 import eu.etaxonomy.cdm.io.common.SortIndexUpdaterConfigurator;
 import eu.etaxonomy.cdm.io.dwca.in.DwcaImportConfigurator;
@@ -501,7 +503,7 @@ public class ImportManager extends AbstractIOManager<IImportConfigurator> implem
                return job;
        }
 
-    public Job createIOServiceJob(final SortIndexUpdaterConfigurator configurator) {
+    public Job createIOServiceJob(final ImportConfiguratorBase configurator) {
         Assert.isNotNull(configurator, "Configuration may not be null");
         final Display display = Display.getDefault();
         Job job = new Job("Update: " + configurator.getClass().getSimpleName()) {
@@ -510,8 +512,13 @@ public class ImportManager extends AbstractIOManager<IImportConfigurator> implem
             protected IStatus run(IProgressMonitor monitor) {
                 monitor.beginTask("Updating data", IProgressMonitor.UNKNOWN);
                 IIOService ioService = CdmApplicationState.getIOService();
-
-                ioService.updateSortIndex(configurator);
+                if (configurator instanceof SortIndexUpdaterConfigurator){
+                    SortIndexUpdaterConfigurator config = (SortIndexUpdaterConfigurator)configurator;
+                    ioService.updateSortIndex(config);
+                } else if (configurator instanceof CacheUpdaterConfigurator){
+                    CacheUpdaterConfigurator config = (CacheUpdaterConfigurator) configurator;
+                    ioService.updateCaches(config);
+                }
 
                 monitor.done();
 

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 c17c9e4afcbdc494683a6733b858e824deed706d..0bffd58a48c2c0e4e07e8f43dbfcbee4d3bf7b17 100644 (file)
--- 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
@@ -944,4 +944,91 @@ public class PreferencesUtil implements IPreferenceKeys {
         getPreferenceStore().setValue(CHECKLIST_SHOW_RANK, selection);
     }
 
+    /**
+     * @param object
+     * @param b
+     * @return
+     */
+    public static NameDetailsConfigurator setPreferredNameDetailsConfiguration( boolean local) {
+        NameDetailsConfigurator config = new NameDetailsConfigurator(true);
+        ICdmApplicationConfiguration controller;
+        controller = CdmStore.getCurrentApplicationConfiguration();
+        PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.NameDetailsView);
+        CdmPreference preference = null;
+        if (controller == null){
+            return null;
+        }
+        preference = controller.getPreferenceService().find(key);
+        if (preference == null){
+            return null;
+        }
+        getPreferenceStore().setValue(ALLOW_OVERRIDE_NAMEDETAILS, preference.isAllowOverride());
+
+        //the preference value is build like this:
+        //<section1>:true;<section2>:false....
+
+        String value = preference.getValue();
+        String [] sections = value.split(";");
+        Map<String, Boolean> sectionMap = new HashMap<String, Boolean>();
+        String[] sectionValues;
+        for (String sectionValue: sections){
+            sectionValues = sectionValue.split(":");
+            sectionMap.put(sectionValues[0], Boolean.valueOf(sectionValues[1]));
+        }
+
+
+
+        getPreferenceStore().setValue(SHOW_SIMPLE_NAME_DETAILS_TAXON,
+                (sectionMap.get("taxon")));
+        config.setTaxonSectionActivated(sectionMap.get("taxon"));
+
+        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_LSID,
+                (sectionMap.get("lsid")));
+        config.setLSIDActivated(sectionMap.get("lsid"));
+
+        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_CODE,
+                (sectionMap.get("nc")));
+        config.setNomenclaturalCodeActived(sectionMap.get("nc"));
+
+        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_APPENDED_PHRASE,
+                (sectionMap.get("ap")));
+        config.setAppendedPhraseActivated(sectionMap.get("ap"));
+
+        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_RANK,
+                (sectionMap.get("rank")));
+        config.setRankActivated(sectionMap.get("rank"));
+
+
+        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_ATOMISED_EPITHETS,
+                (sectionMap.get("atomisedEpithets")));
+        config.setAtomisedEpithetsActivated(sectionMap.get("atomisedEpithets"));
+
+        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_AUTHORSHIP,
+                (sectionMap.get("author")));
+        config.setAuthorshipSectionActivated(sectionMap.get("author"));
+
+        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_REFERENCE,
+                (sectionMap.get("nomRef")));
+        config.setNomenclaturalReferenceSectionActivated(sectionMap.get("nomRef"));
+
+        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_STATUS,
+                (sectionMap.get("nomStat")));
+        config.setNomenclaturalStatusSectionActivated(sectionMap.get("nomStat"));
+
+
+        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_PROTOLOGUE,
+                (sectionMap.get("protologue")));
+        config.setProtologueActivated(sectionMap.get("protologue"));
+
+        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_TYPE_DESIGNATION,
+                (sectionMap.get("typeDes")));
+        config.setTypeDesignationSectionActivated(sectionMap.get("typeDes"));
+
+        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_NAME_RELATIONSHIP,
+                (sectionMap.get("nameRelation")));
+        config.setNameRelationsSectionActivated(sectionMap.get("nameRelation"));
+
+        return config;
+    }
+
 }