minor
authorAndreas Müller <a.mueller@bgbm.org>
Tue, 25 Feb 2014 21:36:43 +0000 (21:36 +0000)
committerAndreas Müller <a.mueller@bgbm.org>
Tue, 25 Feb 2014 21:36:43 +0000 (21:36 +0000)
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveContentProvider.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesContentProvider.java

index 8bd9fa6f4386c3156e888ca49a1262b3bc9eede0..6238071e9c65bbe5e502c5c6e385a82fb8bb2378 100644 (file)
@@ -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();
index b49e0496f4114b7383fb3b5509fc98f3c797ef10..063e086cdbdc3079cee6c7f45250e5a4ae884293 100644 (file)
@@ -52,8 +52,8 @@ public class UsesContentProvider extends DescriptiveContentProvider {
         * @return\r
         */\r
        @Override\r
-       protected List<DescriptionBase> getDescriptions(IDescribable<?> parentElement) {\r
-           List<DescriptionBase> descriptions = new ArrayList<DescriptionBase>();\r
+       protected List<DescriptionBase<?>> getDescriptions(IDescribable<?> parentElement) {\r
+           List<DescriptionBase<?>> descriptions = new ArrayList<DescriptionBase<?>>();\r
            if(parentElement instanceof Taxon){\r
                Taxon taxon = (Taxon) parentElement;\r
                this.markerTypes.addAll(CdmStore.getTermManager().getPreferredTerms(MarkerType.class));\r