From 33523106677056f6faa072bf55933b88dcf1e725 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=EF=BF=BD=EF=BF=BDller?= Date: Wed, 20 May 2015 17:35:04 +0000 Subject: [PATCH] added id to uuidAndTitleCache fixes in TaxEditor #4799 --- .../ui/dialog/selection/FeatureSelectionDialog.java | 10 ++-------- .../dialog/selection/FeatureTreeSelectionDialog.java | 6 ++---- .../selection/GrantedAuthoritySelectionDialog.java | 8 +------- .../ui/dialog/selection/GroupSelectionDialog.java | 2 +- .../ui/dialog/selection/NamedAreaSelectionDialog.java | 2 +- .../ui/dialog/selection/UserSelectionDialog.java | 2 +- 6 files changed, 8 insertions(+), 22 deletions(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureSelectionDialog.java index 240982f87..98c7f5049 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureSelectionDialog.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureSelectionDialog.java @@ -52,13 +52,10 @@ public class FeatureSelectionDialog extends super(shell, conversation, title, multi, settings, cdmObject); } - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.dialogs.filteredSelection.AbstractFilteredCdmResourceSelectionDialog#getPersistentObject(java.util.UUID) - */ @Override protected Feature getPersistentObject(UUID uuid) { - DefinedTermBase term = CdmStore.getService(ITermService.class).load(uuid); + DefinedTermBase term = CdmStore.getService(ITermService.class).load(uuid); if(term instanceof Feature){ return (Feature) term; @@ -67,9 +64,6 @@ public class FeatureSelectionDialog extends return null; } - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.dialogs.filteredSelection.AbstractFilteredCdmResourceSelectionDialog#initModel() - */ @Override protected void initModel() { List features = CdmStore.getService(ITermService.class).list(Feature.class, null, null, null, null); @@ -77,7 +71,7 @@ public class FeatureSelectionDialog extends List> featureUuidAndTitleCache = new ArrayList>(); for(Feature feature : features){ - UuidAndTitleCache uuidAndTitleCache = new UuidAndTitleCache(Feature.class, feature.getUuid(), feature.getTitleCache()); + UuidAndTitleCache uuidAndTitleCache = new UuidAndTitleCache(Feature.class, feature.getUuid(), feature.getId(), feature.getTitleCache()); featureUuidAndTitleCache.add(uuidAndTitleCache); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureTreeSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureTreeSelectionDialog.java index 813bf0a3d..45a60c0b6 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureTreeSelectionDialog.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureTreeSelectionDialog.java @@ -94,7 +94,7 @@ public class FeatureTreeSelectionDialog extends } model.clear(); for(FeatureTree featureTree : featureTrees){ - UuidAndTitleCache element = new UuidAndTitleCache(FeatureTree.class, featureTree.getUuid(), featureTree.getTitleCache()); + UuidAndTitleCache element = new UuidAndTitleCache(FeatureTree.class, featureTree.getUuid(),featureTree.getId(), featureTree.getTitleCache()); model.add(element); } } @@ -132,9 +132,7 @@ public class FeatureTreeSelectionDialog extends return String.format("Create a new %1s" , "Feature tree "); } - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.dialogs.filteredSelection.AbstractFilteredCdmResourceSelectionDialog#getNewEntityWizard() - */ + /** {@inheritDoc} */ @Override protected AbstractNewEntityWizard getNewEntityWizard(String parameter) { diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GrantedAuthoritySelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GrantedAuthoritySelectionDialog.java index 1a42ff8d9..4b7135f08 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GrantedAuthoritySelectionDialog.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GrantedAuthoritySelectionDialog.java @@ -66,7 +66,7 @@ public class GrantedAuthoritySelectionDialog extends AbstractFilteredCdmResource for(GrantedAuthorityImpl authority : authorities){ - model.add(new UuidAndTitleCache(GrantedAuthorityImpl.class, authority.getUuid(),String.format("%s", GrantedAuthorityLabelTextProvider.getText(authority)))); + model.add(new UuidAndTitleCache(GrantedAuthorityImpl.class, authority.getUuid(), authority.getId(), String.format("%s", GrantedAuthorityLabelTextProvider.getText(authority)))); } } @@ -78,17 +78,11 @@ public class GrantedAuthoritySelectionDialog extends AbstractFilteredCdmResource return String.format("Create a new %1s", "GrantedAuthority "); } - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.AbstractFilteredCdmResourceSelectionDialog#getNewEntityWizard(java.lang.String) - */ @Override protected AbstractNewEntityWizard getNewEntityWizard(String parameter) { return new NewGrantedAuthorityWizard(); } - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.AbstractFilteredCdmResourceSelectionDialog#getPersistentObject(java.util.UUID) - */ @Override protected GrantedAuthorityImpl getPersistentObject(UUID uuid) { return CdmStore.getService(IGrantedAuthorityService.class).load(uuid); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GroupSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GroupSelectionDialog.java index 45c9980fc..2abd2f0e9 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GroupSelectionDialog.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GroupSelectionDialog.java @@ -62,7 +62,7 @@ public class GroupSelectionDialog extends model = new ArrayList>(); for(Group group : groups){ - model.add(new UuidAndTitleCache(Group.class, group.getUuid(),String.format("%s", group.getName()))); + model.add(new UuidAndTitleCache(Group.class, group.getUuid(), group.getId(), String.format("%s", group.getName()))); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java index f2eee3965..17cb55b9b 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java @@ -154,7 +154,7 @@ public class NamedAreaSelectionDialog extends model.clear(); for(Object areaObject : terms){ NamedArea area = (NamedArea) HibernateProxyHelper.deproxy(areaObject); - UuidAndTitleCache element = new UuidAndTitleCache(NamedArea.class, area.getUuid(), getTitle(area)); + UuidAndTitleCache element = new UuidAndTitleCache(NamedArea.class, area.getUuid(), area.getId(), getTitle(area)); model.add(element); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/UserSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/UserSelectionDialog.java index a73d9443d..5ffa55837 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/UserSelectionDialog.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/UserSelectionDialog.java @@ -68,7 +68,7 @@ public class UserSelectionDialog extends model = new ArrayList>(); for(User user : users){ - model.add(new UuidAndTitleCache(User.class, user.getUuid(),String.format("%s, %s", user.getUsername(), user.getPerson()))); + model.add(new UuidAndTitleCache(User.class, user.getUuid(), user.getId(), String.format("%s, %s", user.getUsername(), user.getPerson()))); } } -- 2.34.1