Merge branch 'develop' into LibrAlign

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / dialog / selection / AmplificationSelectionDialog.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AmplificationSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AmplificationSelectionDialog.java
index 4cb133747fb395debbe515fab9e08c29fb062ff8..9fc487972a89a18e66807eee7f9a9ddbaaee7155 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AmplificationSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AmplificationSelectionDialog.java
@@ -1,4 +1,3 @@
-// $Id$
 /**
  * Copyright (C) 2014 EDIT
  * European Distributed Institute of Taxonomy
@@ -32,7 +31,7 @@ AbstractFilteredCdmResourceSelectionDialog<Amplification> {
 
     public static Amplification select(Shell shell, ConversationHolder conversation, Amplification amplification){
         AmplificationSelectionDialog dialog = new AmplificationSelectionDialog(shell, conversation,
-                "Choose Unit", false, AmplificationSelectionDialog.class.getCanonicalName(), amplification);
+                "Choose Amplification", false, AmplificationSelectionDialog.class.getCanonicalName(), amplification);
         return getSelectionFromDialog(dialog);
     }
 
@@ -54,14 +53,14 @@ AbstractFilteredCdmResourceSelectionDialog<Amplification> {
         if(amplification != null){
             return amplification;
         }
-        MessagingUtils.error(this.getClass(), "Selected unit is not an amplification", null);
+        MessagingUtils.error(this.getClass(), "Selected element is not an amplification", null);
         return null;
     }
 
     /** {@inheritDoc} */
     @Override
     protected void initModel() {
-        model = CdmStore.getService(IAmplificationService.class).getAmplificationUuidAndDescription();
+        model = CdmStore.getService(IAmplificationService.class).getAmplificationUuidAndLabelCache();
     }
 
     /* (non-Javadoc)
@@ -70,7 +69,7 @@ AbstractFilteredCdmResourceSelectionDialog<Amplification> {
     @Override
     protected String getTitle(Amplification cdmObject) {
         if(cdmObject!=null){
-            return cdmObject.getDescription();
+            return cdmObject.getLabelCache();
         }
         return super.getTitle(cdmObject);
     }