BGBM BDI Projects / taxeditor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 36e0ed0)
some more changes in checklist editor
authorKatja Luther <k.luther@bgbm.org>
Fri, 16 Feb 2018 07:34:47 +0000 (08:34 +0100)
committerKatja Luther <k.luther@bgbm.org>
Fri, 16 Feb 2018 07:43:50 +0000 (08:43 +0100)
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditor.java patch | blob | history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistLabelProvider.java patch | blob | history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/ChecklistEditorE4.java patch | blob | history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionEditingSupportE4.java patch | blob | history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/edit/DistributionEditingSupport.java patch | blob | history

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 f9719cc74f22a888fc1b799e1a768edddaab3a9e..e1e9c477306b75286188eeb6938708964bd0b3fc 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
@@ -239,7 +239,7 @@ public class ChecklistEditor extends EditorPart implements ISelectionListener, I
 //             });
         labelProvider = new ChecklistLabelProvider(this.viewer);
 
-        terms = labelProvider.getNamedAreas();
+        terms = labelProvider.getNamedAreas(false);
         if (terms == null){
                        MessagingUtils.informationDialog(Messages.ChecklistEditor_NO_AREAS, Messages.ChecklistEditor_NO_AREAS_MESSAGE);
                        this.dispose();
@@ -561,7 +561,7 @@ public class ChecklistEditor extends EditorPart implements ISelectionListener, I
 //     } else{
 //         terms = (SortedSet<DefinedTermBase>) labelProvider.getTermsOrderedByLabels(labelProvider.getNamedAreas(), CdmStore.getDefaultLanguage());
 //     }
-       SortedSet<DefinedTermBase> newTerms = labelProvider.getNamedAreas();
+       SortedSet<DefinedTermBase> newTerms = labelProvider.getNamedAreas(true);
        toolItem.removeSelectionListener(dropListener);
        hideDistributionColumns(oldTerms);
        createToolbarItems();
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistLabelProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistLabelProvider.java
index dfd0b565cdb09148694268110cbffef19ba153b3..c7234a43a7f3853c3394df5aa26b1b3faf58d957 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistLabelProvider.java
@@ -53,7 +53,7 @@ public class ChecklistLabelProvider extends LabelProvider implements ITableLabel
 
     public static final String DEFAULT_ENTRY = ""; //$NON-NLS-1$
     private IDescriptionService descriptionService;
-    private final SortedSet<DefinedTermBase> namedAreas;
+    private SortedSet<DefinedTermBase> namedAreas;
     TableViewer viewer = null;
 
     /**
@@ -219,7 +219,10 @@ public class ChecklistLabelProvider extends LabelProvider implements ITableLabel
     /**
      * @return the namedAreas
      */
-    public SortedSet<DefinedTermBase> getNamedAreas() {
+    public SortedSet<DefinedTermBase> getNamedAreas(boolean load) {
+        if (load){
+            namedAreas = loadNamedAreas();
+        }
         return namedAreas;
     }
 
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 59eeea562dbd3338bed6c7ae12e65b027f39ea7f..a6441f6bd116b4623f7e6a2c2e6a4238b33ad068 100644 (file)
--- 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
@@ -190,7 +190,7 @@ public class ChecklistEditorE4 implements IPartContentHasFactualData, IConversat
 
         labelProvider = new ChecklistLabelProvider(this.viewer);
 
-        terms = labelProvider.getNamedAreas();
+        terms = labelProvider.getNamedAreas(false);
         if (terms == null){
                        MessagingUtils.informationDialog(Messages.ChecklistEditor_NO_AREAS, Messages.ChecklistEditor_NO_AREAS_MESSAGE);
                        this.dispose();
@@ -524,19 +524,19 @@ public class ChecklistEditorE4 implements IPartContentHasFactualData, IConversat
 //     } else{
 //         terms = (SortedSet<DefinedTermBase>) labelProvider.getTermsOrderedByLabels(labelProvider.getNamedAreas(), CdmStore.getDefaultLanguage());
 //     }
-       SortedSet<DefinedTermBase> newTerms = labelProvider.getNamedAreas();
+       SortedSet<DefinedTermBase> newTerms = labelProvider.getNamedAreas(true);
        toolItem.removeSelectionListener(dropListener);
        hideDistributionColumns(oldTerms);
        createToolbarItems();
        toolItem.addSelectionListener(dropListener);
-       
+
        for(DefinedTermBase term:newTerms){
                int count = viewer.getTable().getColumnCount();
                String termLable = term.getTitleCache();;
                if (PreferencesUtil.isShowIdInVocabularyInChecklistEditor()){
                        if (term.getIdInVocabulary() != null){
                                termLable = term.getIdInVocabulary();
-               } 
+               }
                }
                addTableViewerColumn(termLable, 200, count);
                acitivateNewColumnInDropDownMenu(term);
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionEditingSupportE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionEditingSupportE4.java
index 7b864bda048356b5b34fce01cf6265ccd2a690de..adfdb405c2b44ec3704e6b61f19138c78f9a3bb0 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionEditingSupportE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionEditingSupportE4.java
@@ -205,7 +205,7 @@ public final class DistributionEditingSupportE4 extends EditingSupport {
     private void createDistributionForColumn(Taxon taxon, PresenceAbsenceTerm occurenceStatus) {
         TableColumn column = viewer.getTable().getColumn(columnIndex);
 
-        SortedSet<DefinedTermBase> namedAreas = this.editor.getLabelProvider().getNamedAreas();
+        SortedSet<DefinedTermBase> namedAreas = this.editor.getLabelProvider().getNamedAreas(false);
 
 
         if (namedAreas != null) {
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/edit/DistributionEditingSupport.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/edit/DistributionEditingSupport.java
index 09a53ce419da7ded910b98aa8587ba6e09a85194..68feff5e21541e17870b44a9d95b1e872b47576a 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/edit/DistributionEditingSupport.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/edit/DistributionEditingSupport.java
@@ -17,7 +17,6 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.TableColumn;
 
-import eu.etaxonomy.cdm.api.service.IDescriptionService;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
@@ -86,7 +85,7 @@ public final class DistributionEditingSupport extends EditingSupport {
             Taxon taxon = (Taxon) element;
             String result = null;
             Distribution distributionForColumn = getDistributionForColumn(taxon);
-           
+
             if (distributionForColumn != null) {
                 PresenceAbsenceTerm status = distributionForColumn.getStatus();
                 if (PreferencesUtil.isShowIdInVocabularyInChecklistEditor()){
@@ -102,7 +101,7 @@ public final class DistributionEditingSupport extends EditingSupport {
                        result.concat(" ("+ status.getSymbol() + ")");
                 }
             }
-           
+
             return result;
         }
         return null;
@@ -166,7 +165,7 @@ public final class DistributionEditingSupport extends EditingSupport {
     private void createDistributionForColumn(Taxon taxon, PresenceAbsenceTerm occurenceStatus) {
         TableColumn column = viewer.getTable().getColumn(columnIndex);
 
-        SortedSet<DefinedTermBase> namedAreas = this.editor.getLabelProvider().getNamedAreas();
+        SortedSet<DefinedTermBase> namedAreas = this.editor.getLabelProvider().getNamedAreas(false);
 
 
         if (namedAreas != null) {