From: Andreas Müller <a.mueller@bgbm.org>
Date: Tue, 25 Feb 2014 21:36:43 +0000 (+0000)
Subject: minor
X-Git-Tag: 3.6.0~757
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/7b04760e5697a7bb7b089ab7c829c0fa81e259ea

minor
---

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveContentProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveContentProvider.java
index 8bd9fa6f4..6238071e9 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveContentProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveContentProvider.java
@@ -129,10 +129,10 @@ public class DescriptiveContentProvider implements ITreeContentProvider {
      * @param parentElement
      * @return
      */
-    protected List<DescriptionBase> getDescriptions(IDescribable<?> parentElement) {
-        Set<? extends DescriptionBase> elementDescriptions = parentElement.getDescriptions();
-        List<DescriptionBase> resultDescriptions = new ArrayList<DescriptionBase>();
-        for(DescriptionBase description : elementDescriptions){
+    protected List<DescriptionBase<?>> getDescriptions(IDescribable<?> parentElement) {
+        Set<? extends DescriptionBase<?>> elementDescriptions = parentElement.getDescriptions();
+        List<DescriptionBase<?>> resultDescriptions = new ArrayList<DescriptionBase<?>>();
+        for(DescriptionBase<?> description : elementDescriptions){
 			if(! description.isImageGallery()){
 				MarkerType useMarkertype = (MarkerType) CdmStore.getService(ITermService.class).find(UsageTermCollection.uuidUseMarkerType);
 				Set<Marker> descriptionMarkers = description.getMarkers();
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesContentProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesContentProvider.java
index b49e0496f..063e086cd 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesContentProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesContentProvider.java
@@ -52,8 +52,8 @@ public class UsesContentProvider extends DescriptiveContentProvider {
 	 * @return
 	 */
 	@Override
-	protected List<DescriptionBase> getDescriptions(IDescribable<?> parentElement) {
-	    List<DescriptionBase> descriptions = new ArrayList<DescriptionBase>();
+	protected List<DescriptionBase<?>> getDescriptions(IDescribable<?> parentElement) {
+	    List<DescriptionBase<?>> descriptions = new ArrayList<DescriptionBase<?>>();
 	    if(parentElement instanceof Taxon){
 	        Taxon taxon = (Taxon) parentElement;
 	        this.markerTypes.addAll(CdmStore.getTermManager().getPreferredTerms(MarkerType.class));