cleanup

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java
index 2014815abbf267aad8d081e5898d1df246ad42e8..3e02249291f1c973fa3eccd3da0476df024674f6 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java
@@ -37,7 +37,6 @@ import eu.etaxonomy.taxeditor.model.MessagingUtils;
  *
  * @author n.hoffmann
  * @created Jun 15, 2010
- * @version 1.0
  */
 public class MediaContentProvider implements ITreeContentProvider{
 
@@ -60,8 +59,8 @@ public class MediaContentProvider implements ITreeContentProvider{
                                MessagingUtils.error(getClass(), "Taxon is null", null); //$NON-NLS-1$
                                return NO_CHILDREN;
                        }
-                       HashSet<DescriptionBase> imageGalleries = new HashSet<DescriptionBase>();
-                       for(DescriptionBase description : taxon.getDescriptions()){
+                       HashSet<DescriptionBase<?>> imageGalleries = new HashSet<>();
+                       for(DescriptionBase<?> description : taxon.getDescriptions()){
                                if(description.isImageGallery()){
                                        imageGalleries.add(description);
                                }
@@ -69,8 +68,8 @@ public class MediaContentProvider implements ITreeContentProvider{
                        return imageGalleries.toArray();
                }
                else if (parentElement instanceof DescriptionBase) {
-                       if (((DescriptionBase) parentElement).isImageGallery()) {
-                               List<Media> images =  getImages((DescriptionBase) parentElement);
+                       if (((DescriptionBase<?>) parentElement).isImageGallery()) {
+                               List<Media> images =  getImages((DescriptionBase<?>) parentElement);
                                if (images != null){
                                        return images.toArray();
                                }

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 14bc578ad0d5e424ea3cfb0b286042a196a78139..938fd1dc24d6f426b2597c12a12c76e77601c0fc 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
@@ -81,7 +81,7 @@ public class SearchManager {
                List<NameRelationship> relationships = new ArrayList<>();
                List<RelationshipBase> all = CdmStore.getService(INameService.class).getAllRelationships(0, 0);
 
-               for (RelationshipBase relationship : all){
+               for (RelationshipBase<?,?,?> relationship : all){
                        if(relationship instanceof NameRelationship){
                                relationships.add((NameRelationship) relationship);
                        }
@@ -105,10 +105,10 @@ public class SearchManager {
        public List<AgentBase> findAgents(IIdentifiableEntityServiceConfigurator configurator){
 
                if(checkLargeResult(CdmStore.getService(IAgentService.class).countByTitle(configurator))){
-           List<AgentBase> records = CdmStore.getService(IAgentService.class).findByTitle(configurator).getRecords();
-           addUuidSearchResults(records, configurator, IAgentService.class);
-           return records;
-       }
+                   List<AgentBase> records = CdmStore.getService(IAgentService.class).findByTitle(configurator).getRecords();
+                   addUuidSearchResults(records, configurator, IAgentService.class);
+                   return records;
+               }
                return NO_RESULTS;
        }