merge-update from trunk

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

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java
index d33745d887e2b769d06aac3e4fa961a785008fac..54a28eb90e8da393a1672ef28cd52aa29d2a9c58 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java
@@ -16,6 +16,7 @@ import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.agent.Institution;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
+import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl;
 import eu.etaxonomy.cdm.model.common.Group;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
@@ -46,10 +47,10 @@ import eu.etaxonomy.taxeditor.model.MessagingUtils;
  */
 public class SelectionDialogFactory {
 
-       public static <T extends ICdmBase> T getSelectionFromDialog(Class<T> clazz, Shell shell, ConversationHolder conversation, T curentSelection){
+       public static <T extends ICdmBase> T getSelectionFromDialog(Class<T> clazz, Shell shell, ConversationHolder conversation, T currentSelection){
 
                if(clazz.equals(Taxon.class)){
-                       return (T) TaxonBaseSelectionDialog.selectTaxon(shell, conversation, (Taxon) curentSelection);
+                       return (T) TaxonBaseSelectionDialog.selectTaxon(shell, conversation, (Taxon) currentSelection);
                }
                if(clazz.equals(Synonym.class)){
                        return (T) TaxonBaseSelectionDialog.selectSynonym(shell, conversation);
@@ -58,31 +59,35 @@ public class SelectionDialogFactory {
                        return (T) TaxonBaseSelectionDialog.selectTaxonBase(shell, conversation);
                }
                if(clazz.equals(Classification.class)){
-                       return (T) ClassificationSelectionDialog.select(shell, conversation, (Classification) curentSelection);
+                       return (T) ClassificationSelectionDialog.select(shell, conversation, (Classification) currentSelection);
                }
                if(clazz.equals(TaxonNode.class)){
-                       return (T) TaxonNodeSelectionDialog.select(shell, conversation, null, null, (TaxonNode) curentSelection, null);
+                       return (T) TaxonNodeSelectionDialog.select(shell, conversation, null, null, (TaxonNode) currentSelection, null);
                }
                if(clazz.equals(Reference.class)){
-                       return (T) ReferenceSelectionDialog.select(shell, conversation, (Reference) curentSelection);
+                       return (T) ReferenceSelectionDialog.select(shell, conversation, (Reference) currentSelection);
                }
                if(clazz.equals(TaxonNameBase.class)){
-                       return (T) NameSelectionDialog.select(shell, conversation, (TaxonNameBase) curentSelection);
+                       return (T) NameSelectionDialog.select(shell, conversation, (TaxonNameBase) currentSelection);
                }
                if(clazz.equals(Team.class)){
-                       return (T) TeamSelectionDialog.select(shell, conversation, (Team) curentSelection);
+                       return (T) TeamSelectionDialog.select(shell, conversation, (Team) currentSelection);
+               }
+               if(clazz.equals(TeamOrPersonBase.class)){
+                   //TODO: add TeamOrPersonBaseSelectionDialog (see ticket #4545)
+                   return (T) AgentSelectionDialog.select(shell, conversation, (AgentBase) currentSelection);
                }
                if(clazz.equals(AgentBase.class)){
-                       return (T) AgentSelectionDialog.select(shell, conversation, (AgentBase) curentSelection);
+                       return (T) AgentSelectionDialog.select(shell, conversation, (AgentBase) currentSelection);
                }
                if(clazz.equals(Feature.class)){
-                       return (T) FeatureSelectionDialog.select(shell, conversation, (Feature) curentSelection);
+                       return (T) FeatureSelectionDialog.select(shell, conversation, (Feature) currentSelection);
                }
                if(clazz.equals(FeatureTree.class)){
-                       return (T) FeatureTreeSelectionDialog.select(shell, conversation, (FeatureTree) curentSelection);
+                       return (T) FeatureTreeSelectionDialog.select(shell, conversation, (FeatureTree) currentSelection);
                }
                if(clazz.equals(PolytomousKey.class)){
-                       return (T) PolytomousKeySelectionDialog.select(shell, conversation, (PolytomousKey) curentSelection);
+                       return (T) PolytomousKeySelectionDialog.select(shell, conversation, (PolytomousKey) currentSelection);
                }
                if(clazz.equals(PolytomousKeyNode.class)){
                        MessagingUtils.warningDialog("Not implemented yet", SelectionDialogFactory.class,
@@ -90,37 +95,37 @@ public class SelectionDialogFactory {
                        return null;
                }
                if(clazz.equals(DerivedUnit.class)){
-                       return (T) DerivedUnitSelectionDialog.select(shell, conversation, (DerivedUnit) curentSelection);
+                       return (T) DerivedUnitSelectionDialog.select(shell, conversation, (DerivedUnit) currentSelection);
                }
                if(clazz.equals(FieldUnit.class)){
-                       return (T) FieldUnitSelectionDialog.select(shell, conversation, (FieldUnit) curentSelection);
+                       return (T) FieldUnitSelectionDialog.select(shell, conversation, (FieldUnit) currentSelection);
                }
                if(clazz.equals(NamedArea.class)){
-                       return (T) NamedAreaSelectionDialog.select(shell, conversation, (NamedArea) curentSelection);
+                       return (T) NamedAreaSelectionDialog.select(shell, conversation, (NamedArea) currentSelection);
                }
                if(clazz.equals(Collection.class)){
-                       return (T) CollectionSelectionDialog.select(shell, conversation, (Collection) curentSelection);
+                       return (T) CollectionSelectionDialog.select(shell, conversation, (Collection) currentSelection);
                }
                if(clazz.equals(User.class)){
-                       return (T) UserSelectionDialog.select(shell, conversation, (User) curentSelection);
+                       return (T) UserSelectionDialog.select(shell, conversation, (User) currentSelection);
                }
                if(clazz.equals(GrantedAuthorityImpl.class)){
-                       return (T) GrantedAuthoritySelectionDialog.select(shell, conversation, (GrantedAuthorityImpl) curentSelection);
+                       return (T) GrantedAuthoritySelectionDialog.select(shell, conversation, (GrantedAuthorityImpl) currentSelection);
                }
                if (clazz.equals(Person.class)){
-                       return (T) PersonSelectionDialog.select(shell, conversation, (Person) curentSelection);
+                       return (T) PersonSelectionDialog.select(shell, conversation, (Person) currentSelection);
                }
                if(clazz.equals(Group.class)){
-                       return (T) GroupSelectionDialog.select(shell, conversation, (Group) curentSelection);
+                       return (T) GroupSelectionDialog.select(shell, conversation, (Group) currentSelection);
                }
                if(clazz.equals(Institution.class)){
-                       return (T) InstitutionSelectionDialog.select(shell, conversation, (Institution) curentSelection);
+                       return (T) InstitutionSelectionDialog.select(shell, conversation, (Institution) currentSelection);
                }
                if(clazz.equals(Primer.class)){
-                   return (T) PrimerSelectionDialog.select(shell, conversation, (Primer) curentSelection);
+                   return (T) PrimerSelectionDialog.select(shell, conversation, (Primer) currentSelection);
                }
                if(clazz.equals(Amplification.class)){
-                   return (T) AmplificationSelectionDialog.select(shell, conversation, (Amplification) curentSelection);
+                   return (T) AmplificationSelectionDialog.select(shell, conversation, (Amplification) currentSelection);
                }
 
                return null;