From 968bf39ee93ef3b01f93b2e8befa2c23716b25a8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Thu, 14 Nov 2013 12:52:28 +0000 Subject: [PATCH] fix ClassCast for Teams --- .../selection/NomenclaturalAuthorTeamSelectionDialog.java | 3 ++- .../taxeditor/ui/dialog/selection/TeamSelectionDialog.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalAuthorTeamSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalAuthorTeamSelectionDialog.java index f43399142..5d9099441 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalAuthorTeamSelectionDialog.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalAuthorTeamSelectionDialog.java @@ -17,6 +17,7 @@ import org.eclipse.swt.widgets.Shell; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.service.IAgentService; import eu.etaxonomy.cdm.model.agent.Team; +import eu.etaxonomy.cdm.model.common.CdmBase; import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard; import eu.etaxonomy.taxeditor.newWizard.NewTeamWizard; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -81,6 +82,6 @@ public class NomenclaturalAuthorTeamSelectionDialog extends /** {@inheritDoc} */ @Override protected Team getPersistentObject(UUID uuid) { - return (Team) CdmStore.getService(IAgentService.class).load(uuid); + return CdmBase.deproxy(CdmStore.getService(IAgentService.class).load(uuid), Team.class) ; } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TeamSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TeamSelectionDialog.java index ec2e3fb76..923a26a4d 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TeamSelectionDialog.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TeamSelectionDialog.java @@ -17,6 +17,7 @@ import org.eclipse.swt.widgets.Shell; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.service.IAgentService; import eu.etaxonomy.cdm.model.agent.Team; +import eu.etaxonomy.cdm.model.common.CdmBase; import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard; import eu.etaxonomy.taxeditor.newWizard.NewTeamWizard; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -85,6 +86,6 @@ public class TeamSelectionDialog extends /** {@inheritDoc} */ @Override protected Team getPersistentObject(UUID uuid) { - return (Team) CdmStore.getService(IAgentService.class).load(uuid); + return CdmBase.deproxy(CdmStore.getService(IAgentService.class).load(uuid), Team.class); } } -- 2.34.1