further development of the checklist editor

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / view / checklist / ChecklistEditor.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditor.java
index cdecde04a0e8e248afbcace4e134729bc470c3e0..9ae2a675c1e6a214a224ffdeaf60b9fbe13ad0db 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditor.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditor.java
@@ -99,6 +99,9 @@ public class ChecklistEditor extends EditorPart implements ISelectionListener, I
      */
     private static final String CHECKLIST_EDITOR_MEMENTO_KEY = "checklistEditor";
 
+
+
+
     private class ChecklistJob extends Job {
 
         private List<TaxonNode> taxonNodes;
@@ -110,6 +113,7 @@ public class ChecklistEditor extends EditorPart implements ISelectionListener, I
             super(title);
             this.taxonNodes = listTaxonNodes;
 
+
         }
 
         /*
@@ -187,6 +191,8 @@ public class ChecklistEditor extends EditorPart implements ISelectionListener, I
 
     private final ICdmEntitySession cdmEntitySession;
 
+    private ChecklistLabelProvider labelProvider;
+
     private SortedSet<DefinedTermBase> terms = null;
        private ToolItem toolItem;
        private ChecklistDropdownSelectionListener dropListener;
@@ -213,6 +219,7 @@ public class ChecklistEditor extends EditorPart implements ISelectionListener, I
      */
     public ChecklistEditor() {
         cdmEntitySession = CdmStore.getCurrentSessionManager().newSession(this, true);
+
     }
 
     /** {@inheritDoc} */
@@ -222,10 +229,10 @@ public class ChecklistEditor extends EditorPart implements ISelectionListener, I
         taxonNodeService = CdmStore.getService(ITaxonNodeService.class);
         selectionService = getSite().getWorkbenchWindow().getSelectionService();
         selectionService.addSelectionListener(this);
+        viewer = new TableViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION);
+        labelProvider = new ChecklistLabelProvider(this.viewer);
+        terms = labelProvider.getNamedAreas();
         filter = new ChecklistEditorFilter();
-        ChecklistLabelProvider labelProvider = new ChecklistLabelProvider();
-        terms = (SortedSet<DefinedTermBase>) labelProvider.getTermsOrderedByLabels(labelProvider.getNamedAreas(),
-                CdmStore.getDefaultLanguage());
         createTopComposite(parent);
         loadDataInput();
     }
@@ -241,7 +248,7 @@ public class ChecklistEditor extends EditorPart implements ISelectionListener, I
 
         final Text searchText = createSearchBar(parent);
         createToolbar(parent);
-        viewer = new TableViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION);
+
         getSite().setSelectionProvider(viewer);
 
         final ModifyListener modifyListener = new ChecklistModifyListener(viewer, filter, searchText);
@@ -254,7 +261,7 @@ public class ChecklistEditor extends EditorPart implements ISelectionListener, I
         createTable();
 
         viewer.setContentProvider(new ChecklistContentProvider());
-        viewer.setLabelProvider(new ChecklistLabelProvider(viewer));
+        viewer.setLabelProvider(this.labelProvider);
         comparator = new ChecklistEditorComparator();
         viewer.setComparator(comparator);
 
@@ -321,9 +328,16 @@ public class ChecklistEditor extends EditorPart implements ISelectionListener, I
     private void createTable() {
         Table table = viewer.getTable();//new Table(parent, viewer.getTable().getStyle());
         List<String> titles = new ArrayList<String>();
-        Collections.addAll(titles, "Taxon", "Author", "Rank");
         List<Integer> bounds = new ArrayList<Integer>();
-        Collections.addAll(bounds, 300, 200, 200);
+        if (PreferencesUtil.isShowRankInChecklistEditor()){
+            Collections.addAll(titles, "Taxon",  "Rank");
+            Collections.addAll(bounds, 300, 200);
+        } else{
+            Collections.addAll(titles, "Taxon");
+            Collections.addAll(bounds, 300);
+        }
+
+
         Map<Integer, Boolean> restoreValuesForColumnWidth = restoreValuesForColumnWidth(titles, bounds);
         createInitalDistributionColumns(table, titles, bounds, restoreValuesForColumnWidth);
         table.setSortDirection(SWT.DOWN);
@@ -342,8 +356,7 @@ public class ChecklistEditor extends EditorPart implements ISelectionListener, I
      * @param restoreValuesForColumnWidth
      */
        private void createInitalDistributionColumns(Table table,
-                       List<String> titles, List<Integer> bounds,
-                       Map<Integer, Boolean> restoreValuesForColumnWidth) {
+                       List<String> titles, List<Integer> bounds, Map<Integer, Boolean> restoreValuesForColumnWidth) {
                for (int columnIndex = 0; columnIndex < titles.size(); columnIndex++) {
             TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
             column.getColumn().setText(titles.get(columnIndex));
@@ -351,19 +364,19 @@ public class ChecklistEditor extends EditorPart implements ISelectionListener, I
             column.getColumn().setResizable(true);
             column.getColumn().setMoveable(true);
             column.getColumn().addSelectionListener(getSelectionAdapter(column.getColumn(), columnIndex));
-            if (columnIndex == 1) {
+            if (columnIndex == 0) {
                 table.setSortColumn(column.getColumn());
             }
-            if (columnIndex == 2) {
+            if (columnIndex == 1 && PreferencesUtil.isShowRankInChecklistEditor()) {
                /** uncommented it for now because no rank editing is wanted **/
 //                column.setEditingSupport(new RankEditingSupport(viewer, this));
             }
-            if (columnIndex >= 3) {
+            if ((columnIndex == 1 && !PreferencesUtil.isShowRankInChecklistEditor()) || columnIndex >= 2 ) {
                 //read PrefrenceStore to setWidth according to last saved state
                 if(restoreValuesForColumnWidth.get(columnIndex)){
-                    column.getColumn().setWidth(100);
+                    column.getColumn().setWidth(50);
                 }else{
-                    column.getColumn().setWidth(0);
+                    column.getColumn().setWidth(50);
                 }
                 column.setEditingSupport(new DistributionEditingSupport(viewer, this, columnIndex));
             }
@@ -383,11 +396,24 @@ public class ChecklistEditor extends EditorPart implements ISelectionListener, I
                        List<Integer> bounds) {
                Map<Integer, Boolean> restoreColumnWidth = new HashMap<Integer, Boolean>();
                if (terms != null) {
-            int columnIndex = 4;
+                   int columnIndex;
+                   if (PreferencesUtil.isShowRankInChecklistEditor()){
+                       columnIndex = 2;
+                   } else{
+                       columnIndex = 1;
+                   }
             for (DefinedTermBase<DefinedTermBase> term : terms) {
                 if(term != null){
                     restoreColumnWidth.put(columnIndex, PreferencesUtil.getPreferenceStore().getBoolean(term.getUuid().toString()));
-                    titles.add(term.getTitleCache());
+                    if (PreferencesUtil.isShowIdInVocabularyInChecklistEditor()){
+                        if (term.getIdInVocabulary() != null){
+                            titles.add(term.getIdInVocabulary());
+                        } else{
+                            titles.add(term.getTitleCache());
+                        }
+                    }else{
+                        titles.add(term.getTitleCache());
+                    }
                     bounds.add(200);
                     columnIndex++;
                 }
@@ -427,7 +453,7 @@ public class ChecklistEditor extends EditorPart implements ISelectionListener, I
         TaxonNode taxonNode = checklistEditorInput.getTaxonNode();
         if (classification != null && taxonNode == null) {
             countNodes = taxonNodeService.countAllNodesForClassification(classification);
-            statusLabel.setText("Anzahl der Elemente: " + (countNodes != null ? countNodes : "uknown"));
+            statusLabel.setText("Anzahl der Elemente: " + (countNodes != null ? countNodes : "unknown"));
             // This should not kill the view nor the editor if something goes
             // wrong
             // TODO: don't load the whole taxonNode Object but rather a small
@@ -505,9 +531,13 @@ public class ChecklistEditor extends EditorPart implements ISelectionListener, I
        Table table = viewer.getTable();
        table.setRedraw(false);
        SortedSet<DefinedTermBase> oldTerms = terms;
-       ChecklistLabelProvider labelProvider = new ChecklistLabelProvider();
-       terms = (SortedSet<DefinedTermBase>) labelProvider.getTermsOrderedByLabels(labelProvider.getNamedAreas(), CdmStore.getDefaultLanguage());
-       SortedSet<DefinedTermBase> newTerms = terms;
+
+//     if (PreferencesUtil.isShowIdInVocabularyInChecklistEditor()){
+//
+//     } else{
+//         terms = (SortedSet<DefinedTermBase>) labelProvider.getTermsOrderedByLabels(labelProvider.getNamedAreas(), CdmStore.getDefaultLanguage());
+//     }
+       SortedSet<DefinedTermBase> newTerms = labelProvider.getNamedAreas();
        toolItem.removeSelectionListener(dropListener);
        hideDistributionColumns(oldTerms);
        createToolbarItems();
@@ -517,7 +547,7 @@ public class ChecklistEditor extends EditorPart implements ISelectionListener, I
                addTableViewerColumn(term.getTitleCache(), 200, count);
                acitivateNewColumnInDropDownMenu(term);
        }
-        viewer.setLabelProvider(new ChecklistLabelProvider(viewer));
+        viewer.setLabelProvider(labelProvider);
         getService().schedule(new ChecklistJob("loading Taxa", selectedTaxonNodes), Job.LONG);
         table.setRedraw(true);
        viewer.refresh();
@@ -793,4 +823,11 @@ public class ChecklistEditor extends EditorPart implements ISelectionListener, I
         // TODO Auto-generated method stub
         return null;
     }
+
+    /**
+     * @return the labelProvider
+     */
+    public ChecklistLabelProvider getLabelProvider() {
+        return labelProvider;
+    }
 }