cleanup

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/lazyloading/CdmLazyLoader.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/lazyloading/CdmLazyLoader.java
index dd29f431b349da6a51bfcbcb561295e1376fe5f2..a35c257b0c90566d6af899941374f28365462a5c 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/lazyloading/CdmLazyLoader.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/lazyloading/CdmLazyLoader.java
@@ -136,19 +136,19 @@ public class CdmLazyLoader {
        private CollectionField getCollectionField(PersistentCollection pc) {
                if(pc != null) {
                        if(pc instanceof PersistentSet) {
-                               return new CollectionField(new HashSet((Set)pc), "set");
+                               return new CollectionField(new HashSet<>((Set)pc), "set");
                        }
                        if(pc instanceof PersistentSortedSet) {
-                               return new CollectionField(new TreeSet((Set)pc), "set");
+                               return new CollectionField(new TreeSet<>((Set)pc), "set");
                        }
                        if(pc instanceof PersistentList) {
-                               return new CollectionField(new ArrayList((List)pc), "list");
+                               return new CollectionField(new ArrayList<>((List)pc), "list");
                        }
                        if(pc instanceof PersistentMap || pc instanceof PersistentMultiLanguageText) {
-                               return new CollectionField(new HashMap((Map)pc), "map");
+                               return new CollectionField(new HashMap<>((Map)pc), "map");
                        }
                        if(pc instanceof PersistentSortedMap) {
-                               return new CollectionField(new TreeMap((Map)pc), "map");
+                               return new CollectionField(new TreeMap<>((Map)pc), "map");
                        }
                }
                return null;

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/RemoteInvocationTermCacher.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/RemoteInvocationTermCacher.java
index 002fc82fb5471102895fb0ccbb1bdf0bf2eee382..e6a9b4cec515351f25514a3812760a6b056e7690 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/RemoteInvocationTermCacher.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/RemoteInvocationTermCacher.java
@@ -36,18 +36,18 @@ public class RemoteInvocationTermCacher implements IRemoteInvocationTermCacher {
     }
 
        @Override
-       public void cacheTerms(RemoteInvocation ri, RemoteInvocationResult rir) {
+       public void cacheTerms(RemoteInvocation remoteInvoc, RemoteInvocationResult remoteInvocResul) {
            if(cdmServiceCacher != null) {
-               if(ri.getMethodName().equals("listByTermType")) {
-                   if(ri.getArguments()[1] == null) {
+               if(remoteInvoc.getMethodName().equals("listByTermType")) {
+                   if(remoteInvoc.getArguments()[1] == null) {
                        Set<DefinedTermBase<?>> terms = new HashSet<>();
-                       if(rir.getValue() != null) {
-                           terms.addAll((List<DefinedTermBase<?>>)rir.getValue());
+                       if(remoteInvocResul.getValue() != null) {
+                           terms.addAll((List<DefinedTermBase<?>>)remoteInvocResul.getValue());
 
                            for(DefinedTermBase<?> term : terms) {
                                cdmServiceCacher.load(term);
                            }
-                           termTypeMap.put((TermType)ri.getArguments()[0], rir);
+                           termTypeMap.put((TermType)remoteInvoc.getArguments()[0], remoteInvocResul);
                        }
                    }
                }