finalizing preferred refactoring

diff --git a/taxeditor-editor/plugin.xml b/taxeditor-editor/plugin.xml
index 19ce5a1f277d7249a883798917b469c04a360731..c248fd3bf4232941365c55c508b63a4507cb874c 100644 (file)
--- a/taxeditor-editor/plugin.xml
+++ b/taxeditor-editor/plugin.xml
@@ -47,6 +47,22 @@
    </extension>
    <extension
          point="org.eclipse.ui.menus">
    </extension>
    <extension
          point="org.eclipse.ui.menus">

+      <menuContribution
+            locationURI="toolbar:org.eclipse.ui.main.toolbar">
+         <toolbar
+               id="eu.etaxonomy.taxeditor.editor.main">
+            <command
+                  commandId="org.eclipse.ui.newWizard"
+                  label="New"
+                  style="push">
+            </command>
+            <command
+                  commandId="org.eclipse.ui.file.save"
+                  label="Save"
+                  style="push">
+            </command>
+         </toolbar>
+      </menuContribution>

       <!--menuContribution
             locationURI="menu:org.eclipse.ui.main.menu">
          <menu
       <!--menuContribution
             locationURI="menu:org.eclipse.ui.main.menu">
          <menu

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/AbstractDynamicConceptRelationMenu.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/AbstractDynamicConceptRelationMenu.java
index d85f918b654d7203afe803e331df8b58f7f88a93..013cdee81512180cacbe3f64fa4d6279dc9a909e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/AbstractDynamicConceptRelationMenu.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/AbstractDynamicConceptRelationMenu.java
@@ -14,6 +14,7 @@ import org.eclipse.ui.handlers.IHandlerService;
 
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
 
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;

+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;

 import eu.etaxonomy.taxeditor.store.VocabularyStore;
 
 /**
 import eu.etaxonomy.taxeditor.store.VocabularyStore;
 
 /**


@@ -33,7 +34,7 @@ public abstract class AbstractDynamicConceptRelationMenu extends ContributionIte
        public void fill(Menu menu, int index){
                final IHandlerService handlerService = (IHandlerService) TaxeditorEditorPlugin.getDefault().getWorkbench().getService(IHandlerService.class);
        
        public void fill(Menu menu, int index){
                final IHandlerService handlerService = (IHandlerService) TaxeditorEditorPlugin.getDefault().getWorkbench().getService(IHandlerService.class);
        

-               for(final TaxonRelationshipType type : VocabularyStore.getConceptRelationshipTypes()){
+               for(final TaxonRelationshipType type : PreferencesUtil.getPreferredTaxonRelationshipTypes()){

                        MenuItem menuItem = new MenuItem(menu, -1);
                        menuItem.setText(type.getLabel());
                        menuItem.setData(type);
                        MenuItem menuItem = new MenuItem(menu, -1);
                        menuItem.setText(type.getLabel());
                        menuItem.setData(type);

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseSpecimenTypeWizardPage.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseSpecimenTypeWizardPage.java
index 0d9646d334b7828b52430168a46ea942884083a8..fa21e42f7365183c21835bb77dce589132494fda 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseSpecimenTypeWizardPage.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseSpecimenTypeWizardPage.java
@@ -33,6 +33,7 @@ import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
 import eu.etaxonomy.cdm.model.occurrence.Specimen;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 import eu.etaxonomy.taxeditor.editor.reference.ReferenceSelectComposite;\r
 import eu.etaxonomy.cdm.model.occurrence.Specimen;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 import eu.etaxonomy.taxeditor.editor.reference.ReferenceSelectComposite;\r

+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;\r

 import eu.etaxonomy.taxeditor.store.CdmStore;\r
 import eu.etaxonomy.taxeditor.store.VocabularyStore;\r
 \r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
 import eu.etaxonomy.taxeditor.store.VocabularyStore;\r
 \r


@@ -86,7 +87,7 @@ public class ChooseSpecimenTypeWizardPage extends WizardPage {
                // Create designation type status dropdown \r
                statusCombo = new Combo(container, SWT.BORDER);\r
                statusCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));\r
                // Create designation type status dropdown \r
                statusCombo = new Combo(container, SWT.BORDER);\r
                statusCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));\r

-               typeStatusArray = new SpecimenTypeDesignationStatus[VocabularyStore.getSpecimenTypeDesignationStatus().size()];\r
+               typeStatusArray = new SpecimenTypeDesignationStatus[PreferencesUtil.getPreferredSpecimenTypeDesignationStatus().size()];\r

                int i = 0;\r
                int selectedIndex = -1;\r
                \r
                int i = 0;\r
                int selectedIndex = -1;\r
                \r