try to add a new item to admin menu

diff --git a/eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin.properties b/eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin.properties
index a7ac1d54588364d75a658ab5e44d1d96ee69e392..e2b5531253e668b8fed2ee0ed3433b794ba1248c 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin.properties
+++ b/eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin.properties
@@ -18,4 +18,5 @@ perspective.name.3 = Checklist
 product.name = EDIT Taxonomic Editor\r
 activity.description = Disable unwanted eclipse UI\r
 activity.name = Disable\r
-product.name.0 = EDIT Taxonomic Editor
\ No newline at end of file
+product.name.0 = EDIT Taxonomic Editor\r
+command.label.25 = Import Preferences
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin_de.properties b/eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin_de.properties
index ba37a6c3fda66be14395c2eea313e3a123eb7b5d..7ba63da3739c5c19a1b4e97f57c0858cec68dc8a 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin_de.properties
+++ b/eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin_de.properties
@@ -47,6 +47,7 @@ command.label.21 = Neu
 command.label.22 = Speichern
 command.label.23 = Datenbank Präferenzen
 command.label.24 = Datenbank Reparatur Funktionalität
+command.label.25 = Import Präferenzen
 product.name = EDIT Taxonomischer Editor
 command.name = Parser Hilfe
 command.name.0 = \u00dcber die EDIT Platform

diff --git a/eu.etaxonomy.taxeditor.application/fragment.e4xmi b/eu.etaxonomy.taxeditor.application/fragment.e4xmi
index 6663272b9393eceb0b801f3342d40433db04e046..1e9ad5b620dac87383779195031a18543f21c334 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/fragment.e4xmi
+++ b/eu.etaxonomy.taxeditor.application/fragment.e4xmi
@@ -43,6 +43,7 @@
         <children xsi:type="menu:HandledMenuItem" xmi:id="_VgPDcB-IEeeIA_2gwq7JKg" elementId="org.eclipse.ui.main.menu.admin.dbrepair" label="%command.label.24" command="_LuEl0B-IEeeIA_2gwq7JKg">
           <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_06_ZIB-TEeeIA_2gwq7JKg" coreExpressionId="hasROLE_PROJECT_MANAGER_AND_isCdmStoreConnected"/>
         </children>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_E80JgCaQEeeO2YpaECSmsg" elementId="org.eclipse.ui.main.menu.admin.import_preferences" label="Import Preferences"/>
       </children>
       <children xsi:type="menu:Menu" xmi:id="_MG8QUB6tEeePLJ5to5QrXQ" elementId="org.eclipse.ui.main.menu.help" label="%menu.label.2">
         <children xsi:type="menu:HandledMenuItem" xmi:id="_6vgg4B6gEeePLJ5to5QrXQ" elementId="id.commandlabel16" label="%command.label.16" command="_ye6jsB6gEeePLJ5to5QrXQ"/>
@@ -55,6 +56,7 @@
     <elements xsi:type="commands:Handler" xmi:id="_3wxe4B6gEeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.OpenExternalParserHelpHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.application/eu.etaxonomy.taxeditor.OpenExternalParserHelpHandler" command="_ye6jsB6gEeePLJ5to5QrXQ"/>
     <elements xsi:type="commands:Handler" xmi:id="_cwy_oB-LEeeIA_2gwq7JKg" elementId="eu.etaxonomy.taxeditor.handler.OpenDatabaseRepairWizardHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.OpenDatabaseRepairWizardHandler" command="_LuEl0B-IEeeIA_2gwq7JKg"/>
     <elements xsi:type="commands:Handler" xmi:id="_pZ84gB-LEeeIA_2gwq7JKg" elementId="eu.etaxonomy.taxeditor.handler.OpenDatabasePreferencesWizardHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.OpenDatabasePreferencesWizardHandler" command="_JXXNIB-IEeeIA_2gwq7JKg"/>
+    <elements xsi:type="commands:Handler" xmi:id="_fAnCkCaQEeeO2YpaECSmsg" elementId="eu.etaxonomy.taxeditor.handler.OpenImportPreferenceHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/target.classes.eu.etaxonomy.taxeditor.handler.OpenImportPreferenceHandler" command="_q1JAkCaQEeeO2YpaECSmsg"/>
   </fragments>
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_1jM6sB4JEeehWtOSgLepjA" featurename="commands" parentElementId="org.eclipse.e4.legacy.ide.application">
     <elements xsi:type="commands:Command" xmi:id="_V9LTcB6eEeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.help.aboutPlatform" commandName="%command.name.0"/>
@@ -76,6 +78,7 @@
     <elements xsi:type="commands:Command" xmi:id="_hooiQB7QEeeC-JvycL9ysA" elementId="org.eclipse.ui.newWizard" commandName="%command.label.21"/>
     <elements xsi:type="commands:Command" xmi:id="_JXXNIB-IEeeIA_2gwq7JKg" elementId="eu.etaxonomy.taxeditor.application.DatabaseSettings" commandName="%command.label.23"/>
     <elements xsi:type="commands:Command" xmi:id="_LuEl0B-IEeeIA_2gwq7JKg" elementId="eu.etaxonomy.taxeditor.application.DatabaseRepairFunctionality" commandName="%command.label.24"/>
+    <elements xsi:type="commands:Command" xmi:id="_q1JAkCaQEeeO2YpaECSmsg" elementId="eu.etaxonomy.taxeditor.application.ImportSettings" commandName="%command.label.25"/>
   </fragments>
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_nOhPoB9zEeeIA_2gwq7JKg" featurename="trimContributions" parentElementId="org.eclipse.e4.legacy.ide.application">
     <elements xsi:type="menu:TrimContribution" xmi:id="_FIbzwB92EeeIA_2gwq7JKg" elementId="eu.etaxonomy.taxeditor.application.trimcontribution.0" parentId="org.eclipse.ui.main.toolbar" positionInParent="after=additions">

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportConfiguratorWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportConfiguratorWizardPage.java
index 433dfdd9843334593762f36ebc794ad7f65e8ba0..b791d303500aedd2b22016ebfe8f447aa8147b7f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportConfiguratorWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportConfiguratorWizardPage.java
@@ -9,6 +9,10 @@
 
 package eu.etaxonomy.taxeditor.io.wizard;
 
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -18,6 +22,7 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 
 import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
+import eu.etaxonomy.taxeditor.databaseAdmin.wizard.ListComponent;
 
 /**
  *
@@ -30,11 +35,23 @@ public class AbcdImportConfiguratorWizardPage extends WizardPage {
 
        private Abcd206ImportConfigurator configurator;
 
+       private List<URI> biocaseProvider = new ArrayList<>();
+
+       private boolean isPreferencePage = false;
+
        protected AbcdImportConfiguratorWizardPage(String title, String description, Abcd206ImportConfigurator configurator) {
+        super(PAGE_NAME);
+        this.configurator = configurator;
+        setTitle(title);
+        setDescription(description);
+    }
+
+       protected AbcdImportConfiguratorWizardPage(String title, String description, Abcd206ImportConfigurator configurator, boolean isPreferencePage) {
                super(PAGE_NAME);
                this.configurator = configurator;
                setTitle(title);
                setDescription(description);
+               this.isPreferencePage = isPreferencePage;
        }
 
        public static AbcdImportConfiguratorWizardPage createPage(Abcd206ImportConfigurator configurator){
@@ -42,6 +59,11 @@ public class AbcdImportConfiguratorWizardPage extends WizardPage {
                                "Tooltips will explain parameters in more detail", configurator);
        }
 
+       public static AbcdImportConfiguratorWizardPage createPreferencePage(Abcd206ImportConfigurator configurator){
+        return new AbcdImportConfiguratorWizardPage("Configure import parameters",
+                "Tooltips will explain parameters in more detail", configurator, true);
+    }
+
 
 
        /** {@inheritDoc} */
@@ -51,6 +73,9 @@ public class AbcdImportConfiguratorWizardPage extends WizardPage {
 
                GridLayout gridLayout = new GridLayout();
                composite.setLayout(gridLayout);
+        if (isPreferencePage){
+            ListComponent list = new ListComponent(composite, composite.getStyle());
+        }
 
                Button checkBoxMediaSpecimen = new Button(composite, SWT.CHECK);
                checkBoxMediaSpecimen.setSelection(configurator.isAddMediaAsMediaSpecimen());

diff --git a/eu.etaxonomy.taxeditor.workbench/OSGI-INF/l10n/bundle.properties b/eu.etaxonomy.taxeditor.workbench/OSGI-INF/l10n/bundle.properties
index 967a4e4a48e52102c0ace11b1fab302db8967b78..47376a585bb03c960817864df0fbd55d57313c73 100644 (file)
--- a/eu.etaxonomy.taxeditor.workbench/OSGI-INF/l10n/bundle.properties
+++ b/eu.etaxonomy.taxeditor.workbench/OSGI-INF/l10n/bundle.properties
@@ -31,5 +31,6 @@ command.label.21 = New
 command.label.22 = Save
 command.label.23 = Database Preferences
 command.label.24 = Database Repair Functionality
+command.label.25 = Import Preferences
 command.name = Parser Help
 command.name.0 = About the EDIT Platform

diff --git a/eu.etaxonomy.taxeditor.workbench/OSGI-INF/l10n/bundle_de.properties b/eu.etaxonomy.taxeditor.workbench/OSGI-INF/l10n/bundle_de.properties
index 494758378a76975d2564ecc9596612c303dfdbd8..d86184bbbb7ce63eb55fc219e255f8c5fa6f84d9 100644 (file)
--- a/eu.etaxonomy.taxeditor.workbench/OSGI-INF/l10n/bundle_de.properties
+++ b/eu.etaxonomy.taxeditor.workbench/OSGI-INF/l10n/bundle_de.properties
@@ -30,5 +30,6 @@ command.label.21 = Neu
 command.label.22 = Speichern
 command.label.23 = Datenbank Präferenzen
 command.label.24 = Datenbank Reparatur Funktionalität
+command.label.25 = Import Präferenzen
 command.name = Parser Hilfe
 command.name.0 = \u00dcber die EDIT Platform

diff --git a/eu.etaxonomy.taxeditor.workbench/fragment.e4xmi b/eu.etaxonomy.taxeditor.workbench/fragment.e4xmi
index 167f6daf9c05fb0e1531bf91986fc464c7f80164..4202bb2bef93d026f3fde351f6c0e76656ce9f84 100644 (file)
--- a/eu.etaxonomy.taxeditor.workbench/fragment.e4xmi
+++ b/eu.etaxonomy.taxeditor.workbench/fragment.e4xmi
@@ -100,6 +100,7 @@
     <elements xsi:type="commands:Command" xmi:id="_rSmScCQ8EeeKsvEah5BAoQ" elementId="eu.etaxonomy.taxeditor.update" commandName="%command.label.17"/>
     <elements xsi:type="commands:Command" xmi:id="_tmIbUCQ8EeeKsvEah5BAoQ" elementId="org.eclipse.ui.help.aboutAction" commandName="%command.label.19"/>
     <elements xsi:type="commands:Command" xmi:id="_koenACRAEeeKsvEah5BAoQ" elementId="eu.etaxonomy.taxeditor.install" commandName="%command.label.18"/>
+    <elements xsi:type="commands:Command" xmi:id="_fdEqUCUKEeeHw5lTgGMs1Q" elementId="eu.etaxonomy.taxeditor.workbench.ImportSettings" commandName="%command.label.25"/>
   </fragments>
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_WLNcQCQsEeeq76l4saMAFQ" featurename="handlers" parentElementId="org.eclipse.e4.legacy.ide.application">
     <elements xsi:type="commands:Handler" xmi:id="_WLNcQSQsEeeq76l4saMAFQ" elementId="eu.etaxonomy.taxeditor.OpenExternalAboutPlatformHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.workbench/eu.etaxonomy.taxeditor.workbench.OpenExternalAboutPlatformHandler" command="_UZ2zYCQsEeeq76l4saMAFQ"/>
@@ -108,5 +109,6 @@
     <elements xsi:type="commands:Handler" xmi:id="_WLNcRCQsEeeq76l4saMAFQ" elementId="eu.etaxonomy.taxeditor.handler.OpenDatabasePreferencesWizardHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.OpenDatabasePreferencesWizardHandler" command="_VawPsCQsEeeq76l4saMAFQ"/>
     <elements xsi:type="commands:Handler" xmi:id="_S6Rf4CRAEeeKsvEah5BAoQ" elementId="eu.etaxonomy.taxeditor.update.InstallNewSoftwareHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.workbench/eu.etaxonomy.taxeditor.workbench.update.InstallNewSoftwareHandler" command="_koenACRAEeeKsvEah5BAoQ"/>
     <elements xsi:type="commands:Handler" xmi:id="_uzAhUCRAEeeKsvEah5BAoQ" elementId="eu.etaxonomy.taxeditor.update.UpdateHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.workbench/eu.etaxonomy.taxeditor.workbench.update.UpdateHandler" command="_rSmScCQ8EeeKsvEah5BAoQ"/>
+    <elements xsi:type="commands:Handler" xmi:id="_nSIiECUKEeeHw5lTgGMs1Q" elementId="eu.etaxonomy.taxeditor.handler.OpenImportPreferenceHandler" command="_fdEqUCUKEeeHw5lTgGMs1Q"/>
   </fragments>
 </fragment:ModelFragments>