ref #7086, #7095 Adapt to cdm model changes

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/WorkingSetEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/WorkingSetEditor.java
index c18ac25f313f67f0e7efbc50685650e79b5dd082..d3c91ffe7643e17f17fe0e22dd9810d51061c4b4 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/WorkingSetEditor.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/WorkingSetEditor.java
@@ -150,8 +150,8 @@ IPartContentHasDetails, IDirtyMarkable {
 
     public void init(UUID workingSetUuid) {
         this.workingSet = CdmStore.getService(IWorkingSetService.class).load(workingSetUuid);
-        if(workingSet.getTitleCache()!=null){
-            composite.getTxt_label().setText(workingSet.getTitleCache());
+        if(workingSet.getLabel()!=null){
+            composite.getTxt_label().setText(workingSet.getLabel());
         }
         if(workingSet.getDescriptiveSystem()!=null){
             composite.setCharacters(workingSet.getDescriptiveSystem());

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/WorkingSetNavigator.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/WorkingSetNavigator.java
index f9b401f210a90b2e509d24134ca475256878f7d8..261f5c688e47e735839c0113a6666ad2feb7f82c 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/WorkingSetNavigator.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/WorkingSetNavigator.java
@@ -114,7 +114,7 @@ public class WorkingSetNavigator implements IConversationEnabled, ICdmEntitySess
     }
 
     public void addWorkingSet(WorkingSet workingSet){
-        workingSets.add(new UuidAndTitleCache<>(workingSet.getUuid(), workingSet.getTitleCache()));
+        workingSets.add(new UuidAndTitleCache<>(workingSet.getUuid(), workingSet.getLabel()));
         refresh();
     }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/WorkingSetSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/WorkingSetSelectionDialog.java
index 3a6474308e3bad9671fb1420e6fbca51099f2f75..9ab483c8c3f65e278b402039275c707af8412ebb 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/WorkingSetSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/WorkingSetSelectionDialog.java
@@ -97,7 +97,6 @@ AbstractFilteredCdmResourceSelectionDialog<WorkingSet> {
                     WorkingSet workingSet = WorkingSet.NewInstance();
                     CdmStore.getService(IWorkingSetService.class).merge(workingSet,true);
                     workingSet.setLabel(dialog.getValue());
-                    workingSet.setTitleCache(dialog.getValue(), true);
                     refresh();
                     setPattern(workingSet);
                   }