ref #6159: smaller changes in distribution editor

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditorInput.java
index 93f59f35b5321deb6add9521aaafe625df56e1b6..6159b8854973e67ab059cf03b1ca003a52248343 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditorInput.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditorInput.java
@@ -40,7 +40,7 @@ public class ChecklistEditorInput extends CdmEntitySessionInput implements IPers
      */
     private TaxonNode taxonNode = null;
 
-    private List<Taxon> taxa = new ArrayList<Taxon>();
+    private List<TaxonBase> taxa = new ArrayList();
 
     private Classification classification = null;
 
@@ -94,7 +94,7 @@ public class ChecklistEditorInput extends CdmEntitySessionInput implements IPers
 
 
 
-    public List<Taxon> getTaxa() {
+    public List<TaxonBase> getTaxa() {
                return taxa;
        }
 
@@ -184,11 +184,7 @@ public class ChecklistEditorInput extends CdmEntitySessionInput implements IPers
 
     @Override
     public void merge() {
-        for (TaxonBase taxon:this.taxa){
-            CdmStore.getService(ITaxonService.class).merge(taxon, true);
-        }
-
-
+        CdmStore.getService(ITaxonService.class).merge(taxa, true);
     }
 
     /* (non-Javadoc)
@@ -253,7 +249,7 @@ public class ChecklistEditorInput extends CdmEntitySessionInput implements IPers
     }
 
 
-       public void setTaxa(List<Taxon> taxonList) {
+       public void setTaxa(List<TaxonBase> taxonList) {
                this.taxa = taxonList;
 
        }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/ChecklistDropdownSelectionListenerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/ChecklistDropdownSelectionListenerE4.java
index 5d601a78918933f4009f31e7dbb09440c5735454..0891eb8d72990f2e83f79a7ab23253ce7a0e9f3b 100755 (executable)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/ChecklistDropdownSelectionListenerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/ChecklistDropdownSelectionListenerE4.java
@@ -18,7 +18,6 @@ import org.eclipse.swt.widgets.ToolItem;
 
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.view.checklist.ChecklistEditor;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.preference.wizard.AvailableDistributionWizard;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
@@ -37,7 +36,7 @@ public class ChecklistDropdownSelectionListenerE4 extends SelectionAdapter {
     private final ChecklistEditorE4 editor;
     private final SortedSet<DefinedTermBase> termSet;
     private Logger logger = Logger.getLogger(ChecklistDropdownSelectionListenerE4.class);
-    
+
     public ChecklistDropdownSelectionListenerE4(ToolItem dropdown, ChecklistEditorE4 editor,
             SortedSet<DefinedTermBase> termSet) {
         this.editor = editor;
@@ -49,7 +48,9 @@ public class ChecklistDropdownSelectionListenerE4 extends SelectionAdapter {
     // SearchOption option
     public void add(DefinedTermBase<DefinedTermBase> term) {
         MenuItem menuItem = new MenuItem(menu, SWT.CHECK);
-        menuItem.setText(term.getTitleCache());
+//        if (PreferencesUtil) {
+//            menuItem.setText(term.getTitleCache());
+//        }
         if (PreferencesUtil.getPreferenceStore().getBoolean(term.getUuid().toString())) {
             menuItem.setSelection(true);
         } else {
@@ -127,7 +128,7 @@ public class ChecklistDropdownSelectionListenerE4 extends SelectionAdapter {
             menu.setVisible(true);
         }
     }
-    
+
     public Menu getMenu(){
        return menu;
     }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/ChecklistEditorE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/ChecklistEditorE4.java
index e24d291a59e93cf8886078fac9c12b7c134c8976..46399777a35d14d0d6e79c27fe0a394cd96c1389 100755 (executable)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/ChecklistEditorE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/ChecklistEditorE4.java
@@ -200,6 +200,8 @@ public class ChecklistEditorE4 implements IPartContentHasFactualData, IConversat
     private SortedSet<DefinedTermBase> terms = null;
        private ToolItem toolItem;
        private ChecklistDropdownSelectionListenerE4 dropListener;
+       private Text searchText;
+
 
     /**
      * @return the selectedTaxonNodes
@@ -227,6 +229,8 @@ public class ChecklistEditorE4 implements IPartContentHasFactualData, IConversat
             return;
         }
         taxonNodeService = CdmStore.getService(ITaxonNodeService.class);
+        filter = new ChecklistEditorFilter();
+        createTopComposite(parent);
         viewer = new TableViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION);
 
         //the focuzsCellManager should return the distribution!!!
@@ -255,8 +259,22 @@ public class ChecklistEditorE4 implements IPartContentHasFactualData, IConversat
                        this.dispose();
                        return;
                }
-        filter = new ChecklistEditorFilter();
-        createTopComposite(parent);
+
+
+        viewer.addFilter(filter);
+        createTable();
+
+        viewer.setContentProvider(new ChecklistContentProvider());
+        viewer.setLabelProvider(this.labelProvider);
+        comparator = new ChecklistEditorComparator();
+        viewer.setComparator(comparator);
+        final ModifyListener modifyListener = new ChecklistModifyListener(viewer, filter, searchText);
+
+        searchText.addFocusListener(new ChecklistFocusListener(searchText, modifyListener));
+        searchText.addModifyListener(modifyListener);
+        createGridDataForViewerLayout();
+        createStatusBar(parent);
+        createToolbar(parent);
     }
 
     /**
@@ -268,26 +286,15 @@ public class ChecklistEditorE4 implements IPartContentHasFactualData, IConversat
         gridLayout.marginHeight = 0;
         parent.setLayout(gridLayout);
 
-        final Text searchText = createSearchBar(parent);
-        createToolbar(parent);
+       searchText = createSearchBar(parent);
+
 
        // getSite().setSelectionProvider(viewer);
 
-        final ModifyListener modifyListener = new ChecklistModifyListener(viewer, filter, searchText);
 
-        searchText.addFocusListener(new ChecklistFocusListener(searchText, modifyListener));
-        searchText.addModifyListener(modifyListener);
-        createGridDataForViewerLayout();
 
-        viewer.addFilter(filter);
-        createTable();
 
-        viewer.setContentProvider(new ChecklistContentProvider());
-        viewer.setLabelProvider(this.labelProvider);
-        comparator = new ChecklistEditorComparator();
-        viewer.setComparator(comparator);
 
-        createStatusBar(parent);
     }
 
        private void createGridDataForViewerLayout() {

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionEditorHelper.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionEditorHelper.java
index 218081cdc0fd41fc83552aff0e6b9e0283b457ea..918446aebc98ac189d0537428c6d7a9bd23c44cd 100755 (executable)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionEditorHelper.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionEditorHelper.java
@@ -48,6 +48,9 @@ public class DistributionEditorHelper {
             return null;
         }
         ViewerCell cell = editor.getFocusCell();
+        if (cell == null){
+            return null;
+        }
         if (cell.getElement() instanceof Taxon){
             taxon =(Taxon)cell.getElement();
         } else {