Fix adaptation for new default reference cache strategy #5833
authorAndreas Müller <a.mueller@bgbm.org>
Thu, 26 May 2016 16:51:45 +0000 (18:51 +0200)
committerAndreas Müller <a.mueller@bgbm.org>
Thu, 26 May 2016 16:51:45 +0000 (18:51 +0200)
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ReferenceSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java

index f2b547dd66fb3f378e9fd77974c808820218f8c5..0bba39ae2df1c5fc2c868f526ae89225acc046cd 100644 (file)
@@ -17,7 +17,7 @@ import org.eclipse.swt.widgets.Shell;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IReferenceService;
 import eu.etaxonomy.cdm.model.reference.Reference;
-import eu.etaxonomy.cdm.strategy.cache.reference.NewDefaultReferenceCacheStrategy;
+import eu.etaxonomy.cdm.strategy.cache.reference.DefaultReferenceCacheStrategy;
 import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
 import eu.etaxonomy.taxeditor.newWizard.NewReferenceWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -87,7 +87,7 @@ public class ReferenceSelectionDialog extends AbstractFilteredCdmResourceSelecti
                }else if(cdmObject.getAuthorship() == null){
                        return super.getTitle(cdmObject);
                }else{
-                       return NewDefaultReferenceCacheStrategy.putAuthorToEndOfString(cdmObject.getTitleCache(), cdmObject.getAuthorship().getTitleCache());
+                       return DefaultReferenceCacheStrategy.putAuthorToEndOfString(cdmObject.getTitleCache(), cdmObject.getAuthorship().getTitleCache());
                }
        }
 
index 4fa4562cc67817e38d7f38060ff4df2fa9692320..12e105154da16933124beeb0807b73f92ef2688f 100644 (file)
@@ -443,7 +443,7 @@ public class ReferenceDetailElement extends AbstractIdentifiableEntityDetailElem
                } else if (eventSource == text_abbrevTitle ) {
                    getEntity().setAbbrevTitle(text_abbrevTitle.getText());
                    if (!toggleableAbbrevCache.isEnabled()){
-                       toggleableAbbrevCache.setText(getEntity().generateAbbrevTitle());
+                       toggleableAbbrevCache.setText(getEntity().generateAbbrevTitleCache());
                    }
                } else if (eventSource == text_uri) {
                        getEntity().setUri(text_uri.parseText());
@@ -472,7 +472,7 @@ public class ReferenceDetailElement extends AbstractIdentifiableEntityDetailElem
             toggleable_cache.setText(getEntity().generateTitle());
         }
         if (!getEntity().isProtectedAbbrevTitleCache()) {
-            toggleableAbbrevCache.setText(getEntity().generateAbbrevTitle());
+            toggleableAbbrevCache.setText(getEntity().generateAbbrevTitleCache());
         }
     }