integrate trunk to branch (Taxeditor)

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index 9d14d6312e5af130be7e242b7d2ab4cdd173a97f..d1a4d25439787d1bbc7147780b4d901827010970 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.12-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.12-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.12-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.12-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.12-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.12-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.12-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.12-SNAPSHOT.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry exported="true" kind="lib" path="lib/activation-1.1.jar" sourcepath="lib/activation-1.1src.zip"/>\r
@@ -116,5 +108,13 @@
        <classpathentry exported="true" kind="lib" path="lib/xstream-1.3.1.jar" sourcepath="lib/xstream-1.3.1src.zip"/>\r
        <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-envers-3.4.0-SNAPSHOTsrc.zip"/>\r
        <classpathentry exported="true" kind="lib" path="lib/spring-xml-1.5.6.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.12-SNAPSHOT.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.12-SNAPSHOT.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.12-SNAPSHOT.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.12-SNAPSHOT.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.12-SNAPSHOT.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.12-SNAPSHOT.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.12-SNAPSHOT.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.12-SNAPSHOT.jar"/>\r
        <classpathentry kind="output" path="target/classes"/>\r
 </classpath>\r

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 521905660fe13ad50263c85fcc54d5326c79778d..347a5998770085ca81c1324af11cd7508e6e94a3 100644 (file)
--- 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 dcd411fa8e9bd984fda5ac7cba665028a664d1ed..d5984d1c502772217fe194b37d1946fd86e92bc3 100644 (file)
--- 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 ca321d13724370020c073fcd6f54f377d53efff7..9a8c1668f7bc4587416447e2c5753c1b6371b1c2 100644 (file)
--- 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 952bf050309e23747a8b27e727d2a71919093380..2d514fa8a617dff234efd3ee57b65c89c71d0d6d 100644 (file)
--- 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<UuidAndTitleCache<TaxonBase>> findTaxaAndNames(ITaxonServiceConfigurator configurator){
+       public List<UuidAndTitleCache<TaxonBase>> findTaxaAndNames(IFindTaxaAndNamesConfigurator<TaxonBase> configurator){
                return CdmStore.getService(ITaxonService.class).findTaxaAndNamesForEditor(configurator);
        }