ref #6429: adapt biocase provider preference page
authorKatja Luther <k.luther@bgbm.org>
Thu, 19 Apr 2018 11:36:09 +0000 (13:36 +0200)
committerKatja Luther <k.luther@bgbm.org>
Thu, 19 Apr 2018 11:36:09 +0000 (13:36 +0200)
eu.etaxonomy.taxeditor.store/plugin.xml
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/DatabasePreferencesPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/ListComponent.java [deleted file]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenProviderSelectionComposite.java

index f6a68ed0c6dcd2cc3fc8d30fe7cb8f240182b139..11c9c7e975bdcfd7dcb28568d2a78434d0ceb59a 100755 (executable)
@@ -3,6 +3,7 @@
 <plugin>
    <extension-point id="eu.etaxonomy.taxeditor.store.cdmViewer" name="Cdm Viewer" schema="schema/eu.etaxonomy.taxeditor.store.cdmViewer.exsd"/>
    <extension-point id="eu.etaxonomy.taxeditor.store.preferencePage" name="Preference Page" schema="schema/eu.etaxonomy.taxeditor.store.preferencePage.exsd"/>
+   <extension-point id="eu.etaxonomy.taxeditor.store.adminPreferencePage" name="Admin Preference Page" schema="schema/eu.etaxonomy.taxeditor.store.adminPreferencePage.exsd"/>
    <extension
          point="org.eclipse.ui.menus">
       <menuContribution
          name="%page.name.32">
    </page>
 </extension>
+<extension
+      point="eu.etaxonomy.taxeditor.store.adminPreferencePage">
+    <page
+         class="eu.etaxonomy.taxeditor.preference.TaxonomicEditorGeneralPreferences"
+         id="eu.etaxonomy.taxeditor.preferences.general"
+         name="%page.name">
+   </page>  
+   <page 
+         category="eu.etaxonomy.taxeditor.preferences.general"
+         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.ChecklistEditorGeneralPreference"
+         id="eu.etaxonomy.taxeditor.store.checklist"
+         name="Distribution Editor Configuration">
+   </page>
+   <page
+         category="eu.etaxonomy.taxeditor.preferences.general"
+         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.AbcdImportPreference"
+         id="eu.etaxonomy.taxeditor.store.abcdImportPreference"
+         name="ABCD Import Configuration">
+   </page>
+   <page
+         category="eu.etaxonomy.taxeditor.store.abcdImportPreference"
+         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.AbcdImportProvider"
+         id="eu.etaxonomy.taxeditor.store.abcdImportProvider"
+         name="ABCD Import Provider">
+   </page>
+   
+   <page
+         category="eu.etaxonomy.taxeditor.preferences.general"
+         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.NomenclaturalCodePreferences"
+         id="eu.etaxonomy.taxeditor.store.page2"
+         name="Nomenclatural Code Admin">
+   </page>
+   <page
+         category="eu.etaxonomy.taxeditor.preferences.general"
+         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.NameDetailsViewConfiguration"
+         id="eu.etaxonomy.taxeditor.store.page3"
+         name="Name Details">
+   </page>
+</extension>
 </plugin>
index d076b3becef41ae1509330ef73816a577c8f9b19..aff4b12797ce066c0d149810728e10bffa32e218 100755 (executable)
@@ -27,6 +27,7 @@ import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
 import eu.etaxonomy.cdm.model.metadata.CdmPreference;
 import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
+import eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.ListComponent;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.NomenclaturalCodeHelper;
 import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/ListComponent.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/ListComponent.java
deleted file mode 100755 (executable)
index cb2ff92..0000000
+++ /dev/null
@@ -1,231 +0,0 @@
-/**
-* Copyright (C) 2017 EDIT
-* European Distributed Institute of Taxonomy
-* http://www.e-taxonomy.eu
-*
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-package eu.etaxonomy.taxeditor.databaseAdmin.wizard;
-
-
-import java.awt.Toolkit;
-import java.util.ArrayList;
-
-import javax.swing.event.DocumentEvent;
-
-import org.apache.commons.lang.StringUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Text;
-
-import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
-import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
-
-
-/**
- * @author k.luther
- * @date 20.04.2017
- *
- */
-public class ListComponent
-                      {
-    private List list;
-
-    private static final String addString = "Add";
-    private static final String removeString = "Remove";
-    private Button removeButton;
-    private Text providerURI;
-
-    public ListComponent(Composite parent, int style) {
-        list = new List(parent, SWT.BORDER |  SWT.V_SCROLL);
-
-        java.util.List<String> providerList = new ArrayList<String>();
-        String allProviderString = PreferencesUtil.getPreferenceStore().getString(IPreferenceKeys.BIOCASE_PROVIDER_LIST);
-        //the string is structured like this: http://ww3.bgbm.org/biocase/pywrapper.cgi?dsa=DNA_Bank;http:...;
-        String[] providerArray = allProviderString.split(";");
-
-        for (String providerString : providerArray){
-            if (!StringUtils.isBlank(providerString)){
-                list.add(providerString);
-            }
-        }
-        list.add("");
-
-//        list.setSelection(0);
-        GridData dataList = new GridData();
-        dataList.horizontalAlignment = GridData.FILL;
-        dataList.horizontalSpan = 2;
-        dataList.verticalSpan= 4;
-//        dataList.grabExcessVerticalSpace = true;
-
-        list.setLayoutData(dataList);
-
-
-        providerURI = new Text(parent, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION);
-        GridData dataProviderUri = new GridData();
-        dataProviderUri.horizontalAlignment = GridData.FILL;
-        dataProviderUri.horizontalSpan = 2;
-        providerURI.setLayoutData(dataProviderUri);
-
-        Button addButton = new Button(parent, SWT.NULL);
-        AddListener addListener = new AddListener(addButton);
-        addButton.setText(addString);
-        addButton.addMouseListener(addListener);
-
-        removeButton = new Button(parent, SWT.NULL);
-        removeButton.setText(removeString);
-        removeButton.addMouseListener(new RemoveListener());
-    }
-
-    class RemoveListener implements MouseListener {
-        @Override
-        public void mouseUp(MouseEvent e)  {
-            //This method can be called only if
-            //there's a valid selection
-            //so go ahead and remove whatever's selected.
-            int index = list.getSelectionIndex();
-            list.remove(index);
-
-            int size = list.getItemCount();
-
-            if (size == 0) { //Nothing's left, disable removing.
-                removeButton.setEnabled(false);
-
-            } else { //Select an index.
-                if (index == size) {
-                    //removed item in last position
-                    index--;
-                }
-
-                list.setSelection(index-1);
-
-
-            }
-        }
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public void mouseDoubleClick(MouseEvent e) {
-            // TODO Auto-generated method stub
-
-        }
-
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public void mouseDown(MouseEvent e) {
-            // TODO Auto-generated method stub
-
-        }
-    }
-
-    //This listener is shared by the text field and the add button.
-    class AddListener implements MouseListener {
-        private boolean alreadyEnabled = false;
-        private Button button;
-
-        public AddListener(Button button) {
-            this.button = button;
-        }
-
-
-        protected boolean alreadyInList(String name) {
-            return list.getData(name) != null;
-        }
-
-
-        private void enableButton() {
-            if (!alreadyEnabled) {
-                button.setEnabled(true);
-            }
-        }
-
-        private boolean handleEmptyTextField(DocumentEvent e) {
-            if (e.getDocument().getLength() <= 0) {
-                button.setEnabled(false);
-                alreadyEnabled = false;
-                return true;
-            }
-            return false;
-        }
-
-
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public void mouseDoubleClick(MouseEvent e) {
-            // TODO Auto-generated method stub
-
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public void mouseDown(MouseEvent e) {
-            // TODO Auto-generated method stub
-
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public void mouseUp(MouseEvent e) {
-            String name = providerURI.getText();
-
-            //User didn't type in a unique name...
-            if (name.equals("") || alreadyInList(name)) {
-                Toolkit.getDefaultToolkit().beep();
-                providerURI.selectAll();
-                return;
-            }
-
-            int index = list.getSelectionIndex(); //get selected index
-            if (index == -1) { //no selection, so insert at beginning
-                index = 0;
-            } else {           //add after the selected item
-                index++;
-            }
-
-            list.add(providerURI.getText(), index);
-
-            //Select the new item
-            list.setSelection(index);
-            list.update();
-            providerURI.setText("");
-
-        }
-    }
-
-    protected String createAllProviderString(){
-        String allProviderString = null;
-        boolean first = true;
-        for (String item: list.getItems()){
-            if (first || allProviderString == null || allProviderString == ""){
-                allProviderString = item.trim();
-                first = false;
-            }else{
-                allProviderString +=";"+ item.trim();
-            }
-        }
-
-        return allProviderString;
-
-    }
-
-
-
-}
-
index cc2002d5e4be7df18f35de8e11c6bb261146ca33..9f1f0b3db7733d9e4a03b66fa0f6c74e8a55863f 100644 (file)
@@ -20,7 +20,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.TableWrapData;
 import org.eclipse.ui.forms.widgets.TableWrapLayout;
 
-import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
+import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 
 /**
@@ -66,7 +66,7 @@ public class SpecimenProviderSelectionComposite extends Composite {
         toolkit.adapt(btnBioCaseProvider, true, true);
         btnBioCaseProvider.setText("BioCASE Provider");
         txtAccessPoint = new Combo(this, SWT.BORDER);
-        String items[] = PreferencesUtil.getPreferenceStore().getString(IPreferenceKeys.BIOCASE_PROVIDER_LIST).split(";");
+        String items[] = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.BioCaseProvider).getValue().split(";");
         txtAccessPoint.setItems(items);
         txtAccessPoint.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1));
         toolkit.adapt(txtAccessPoint, true, true);