From d70f4b3c32811eeaecedb64b4c64b164ca9b921c Mon Sep 17 00:00:00 2001 From: Andreas Kohlbecker Date: Fri, 20 Jul 2012 11:14:53 +0000 Subject: [PATCH 1/1] reintergating r15647 from /branches/taxeditor/security/ (changing renamed ITaxaServiceConfigurator to new name IFindTaxaAndNamesConfigurator) --- eu.etaxonomy.taxeditor.cdmlib/.classpath | 240 +++++++++--------- .../navigation/search/SearchBar.java | 10 +- .../navigation/search/SearchResultView.java | 8 +- .../taxeditor/preference/PreferencesUtil.java | 14 +- .../taxeditor/store/SearchManager.java | 5 +- 5 files changed, 138 insertions(+), 139 deletions(-) diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath index 0d65744ee..af0efc67d 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/.classpath +++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath @@ -1,120 +1,120 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java index 521905660..347a59987 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java @@ -34,7 +34,7 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.menus.WorkbenchWindowControlContribution; import org.eclipse.ui.swt.IFocusService; -import eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator; +import eu.etaxonomy.cdm.api.service.config.IFindTaxaAndNamesConfigurator; import eu.etaxonomy.taxeditor.navigation.NavigationUtil; import eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin; import eu.etaxonomy.taxeditor.preference.IPreferenceKeys; @@ -182,7 +182,7 @@ public class SearchBar extends WorkbenchWindowControlContribution{ } - ITaxonServiceConfigurator configurator = configurationListener.getConfigurator(); + IFindTaxaAndNamesConfigurator configurator = configurationListener.getConfigurator(); configurator.setTitleSearchString(searchString); openSearchResultsView(configurator); @@ -200,7 +200,7 @@ public class SearchBar extends WorkbenchWindowControlContribution{ * * @param searchResult */ - private void openSearchResultsView(ITaxonServiceConfigurator configurator) { + private void openSearchResultsView(IFindTaxaAndNamesConfigurator configurator) { boolean openResultInSeparateWindows = PreferencesUtil.getPreferenceStore().getBoolean((IPreferenceKeys.SEARCH_OPEN_RESULTS_IN_SEPARATE_WINDOWS)); if(openResultInSeparateWindows){ //increment change secondary id so it is unique @@ -264,7 +264,7 @@ public class SearchBar extends WorkbenchWindowControlContribution{ */ class ConfigurationSelectionListener extends SelectionAdapter { - private ITaxonServiceConfigurator configurator = PreferencesUtil.getSearchConfigurator(); + private IFindTaxaAndNamesConfigurator configurator = PreferencesUtil.getSearchConfigurator(); /* * (non-Javadoc) @@ -296,7 +296,7 @@ public class SearchBar extends WorkbenchWindowControlContribution{ saveConfigurator(); } - public ITaxonServiceConfigurator getConfigurator() { + public IFindTaxaAndNamesConfigurator getConfigurator() { return configurator; } diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultView.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultView.java index dcd411fa8..d5984d1c5 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultView.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultView.java @@ -37,7 +37,7 @@ import org.eclipse.ui.part.ViewPart; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; -import eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator; +import eu.etaxonomy.cdm.api.service.config.IFindTaxaAndNamesConfigurator; import eu.etaxonomy.cdm.model.common.UuidAndTitleCache; import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; @@ -166,7 +166,7 @@ public class SearchResultView extends ViewPart implements IConversationEnabled{ * * @param configurator a {@link eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator} object. */ - public void performSearch(ITaxonServiceConfigurator configurator){ + public void performSearch(IFindTaxaAndNamesConfigurator configurator){ setPartName("Search: '" + configurator.getTitleSearchString() + "'"); searchString.setText(configurator.getTitleSearchString()); @@ -268,14 +268,14 @@ public class SearchResultView extends ViewPart implements IConversationEnabled{ */ class SearchJob extends Job{ - private ITaxonServiceConfigurator configurator; + private IFindTaxaAndNamesConfigurator configurator; private Display display; /** * @param name */ - public SearchJob(Display display, ITaxonServiceConfigurator configurator) { + public SearchJob(Display display, IFindTaxaAndNamesConfigurator configurator) { super("Performing Search"); this.display = display; this.configurator = configurator; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java index ca321d137..9a8c1668f 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java @@ -24,8 +24,8 @@ import org.eclipse.swt.widgets.Shell; import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeConfigurator; import eu.etaxonomy.cdm.api.service.IFeatureTreeService; import eu.etaxonomy.cdm.api.service.ITermService; -import eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator; -import eu.etaxonomy.cdm.api.service.config.TaxonServiceConfiguratorImpl; +import eu.etaxonomy.cdm.api.service.config.FindTaxaAndNamesConfiguratorImpl; +import eu.etaxonomy.cdm.api.service.config.IFindTaxaAndNamesConfigurator; import eu.etaxonomy.cdm.common.CdmUtils; import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; import eu.etaxonomy.cdm.model.common.ICdmBase; @@ -252,8 +252,8 @@ public class PreferencesUtil implements IPreferenceKeys { * * @return an {@link ITaxonServiceConfigurator} to pass to search methods */ - public static ITaxonServiceConfigurator getSearchConfigurator() { - ITaxonServiceConfigurator configurator = initializeSearchConfigurator(); + public static IFindTaxaAndNamesConfigurator getSearchConfigurator() { + IFindTaxaAndNamesConfigurator configurator = initializeSearchConfigurator(); configurator.setDoTaxa(getPreferenceStore().getBoolean( TAXON_SERVICE_CONFIGURATOR_TAXA)); @@ -274,8 +274,8 @@ public class PreferencesUtil implements IPreferenceKeys { * {@link eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator} * object. */ - public static ITaxonServiceConfigurator initializeSearchConfigurator() { - ITaxonServiceConfigurator configurator = new TaxonServiceConfiguratorImpl(); + public static IFindTaxaAndNamesConfigurator initializeSearchConfigurator() { + IFindTaxaAndNamesConfigurator configurator = new FindTaxaAndNamesConfiguratorImpl(); configurator.setDoTaxa(true); configurator.setDoSynonyms(true); @@ -310,7 +310,7 @@ public class PreferencesUtil implements IPreferenceKeys { * object. */ public static void setSearchConfigurator( - ITaxonServiceConfigurator configurator) { + IFindTaxaAndNamesConfigurator configurator) { getPreferenceStore().setValue(TAXON_SERVICE_CONFIGURATOR_TAXA, configurator.isDoTaxa()); getPreferenceStore().setValue(TAXON_SERVICE_CONFIGURATOR_SYNONYMS, diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java index 952bf0503..2d514fa8a 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java @@ -24,12 +24,11 @@ import eu.etaxonomy.cdm.api.service.IOccurrenceService; import eu.etaxonomy.cdm.api.service.IReferenceService; import eu.etaxonomy.cdm.api.service.ITaxonService; import eu.etaxonomy.cdm.api.service.IUserService; +import eu.etaxonomy.cdm.api.service.config.IFindTaxaAndNamesConfigurator; import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator; -import eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator; import eu.etaxonomy.cdm.model.agent.AgentBase; import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase; import eu.etaxonomy.cdm.model.common.Group; -import eu.etaxonomy.cdm.model.common.IIdentifiableEntity; import eu.etaxonomy.cdm.model.common.RelationshipBase; import eu.etaxonomy.cdm.model.common.User; import eu.etaxonomy.cdm.model.common.UuidAndTitleCache; @@ -97,7 +96,7 @@ public class SearchManager { * @param configurator a {@link eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator} object. * @return a {@link java.util.List} object. */ - public List> findTaxaAndNames(ITaxonServiceConfigurator configurator){ + public List> findTaxaAndNames(IFindTaxaAndNamesConfigurator configurator){ return CdmStore.getService(ITaxonService.class).findTaxaAndNamesForEditor(configurator); } -- 2.34.1