From 56dde679195c429af13ab46ec8426416775c5f6c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Thu, 14 Jun 2018 07:56:13 +0200
Subject: [PATCH] cleanup

---
 .../CdmApplicationRemoteConfiguration.java          | 13 ++++++-------
 .../taxeditor/navigation/search/SearchBar.java      |  9 ++++-----
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
index 55475a9a9..1055ebdc5 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
@@ -112,7 +112,8 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
 
     private ICdmRemoteSource remoteSource;
 
-    private Map serviceMap = new HashMap<Class<IService>, IService>();
+    //TODO should be something like Map<Class<IService>, IService>, but we have no common service base interface yet
+    private Map<Class<?>, Object> serviceMap = new HashMap<>();
 
     private ICdmEntitySessionManager cdmEntitySessionManager;
 
@@ -133,7 +134,7 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
         this.remoteSource = remoteSource;
     }
 
-    private Object getService(Class<?> clazz, String serviceSuffix, HttpComponentsHttpInvokerRequestExecutor executor) {
+    private Object getService(Class<?/* extends IService*/> clazz, String serviceSuffix, HttpComponentsHttpInvokerRequestExecutor executor) {
         if(serviceMap.containsKey(clazz)) {
             return serviceMap.get(clazz);
         }
@@ -345,11 +346,9 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
 
     @Override
     public ProviderManager getAuthenticationManager(){
-        if(authenticationManager != null) {
-            return authenticationManager;
+        if(authenticationManager == null) {
+        	authenticationManager = getAuthenticationManager(getUserService());
         }
-
-        authenticationManager = getAuthenticationManager(getUserService());
         return authenticationManager;
     }
 
@@ -455,7 +454,7 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
         if(cdmPermissionEvaluator != null) {
             return cdmPermissionEvaluator;
         }
-        List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<AccessDecisionVoter<? extends Object>>();
+        List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<>();
         decisionVoters.add(new GrantAlwaysVoter());
         decisionVoters.add(new TaxonNodeVoter());
         decisionVoters.add(new TaxonBaseVoter());
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 41df679c3..a6ada3838 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
@@ -45,7 +45,6 @@ import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.swt.IFocusService;
 
 import eu.etaxonomy.cdm.api.service.config.IFindTaxaAndNamesConfigurator;
-import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.IContextListener;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
@@ -214,7 +213,7 @@ public class SearchBar implements IContextListener{
 		}
 
 
-		IFindTaxaAndNamesConfigurator configurator = configurationListener.getConfigurator();
+		IFindTaxaAndNamesConfigurator<?> configurator = configurationListener.getConfigurator();
 		configurator.setTitleSearchString(searchString);
 		openSearchResultsView(configurator);
 
@@ -233,7 +232,7 @@ public class SearchBar implements IContextListener{
 	 *
 	 * @param searchResult
 	 */
-	private void openSearchResultsView(IFindTaxaAndNamesConfigurator configurator) {
+	private void openSearchResultsView(IFindTaxaAndNamesConfigurator<?> configurator) {
 		boolean openResultInSeparateWindows = PreferencesUtil.getPreferenceStore().getBoolean((IPreferenceKeys.SEARCH_OPEN_RESULTS_IN_SEPARATE_WINDOWS));
 		String partId = AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_NAVIGATION_SEARCH_E4_SEARCHRESULTVIEWE4;
 
@@ -322,7 +321,7 @@ public class SearchBar implements IContextListener{
 	 */
 	class ConfigurationSelectionListener extends SelectionAdapter {
 
-		private IFindTaxaAndNamesConfigurator configurator = PreferencesUtil.getSearchConfigurator();
+		private IFindTaxaAndNamesConfigurator<?> configurator = PreferencesUtil.getSearchConfigurator();
 
 		@Override
 		public void widgetSelected(SelectionEvent e) {
@@ -346,7 +345,7 @@ public class SearchBar implements IContextListener{
 			saveConfigurator();
 		}
 
-		public IFindTaxaAndNamesConfigurator getConfigurator() {
+		public IFindTaxaAndNamesConfigurator<?> getConfigurator() {
 			return configurator;
 		}
 
-- 
2.34.1