AT: committing latest changes to the Tax Editor after a first round of Code review

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / view / uses / UsesContentProvider.java

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 b1052f61c1397449f66ad62b83000aeae9e956fe..98cb3a6834559f77acb3366050c91047c56b85c3 100644 (file)
--- 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
@@ -10,7 +10,7 @@ import java.util.UUID;
 import org.eclipse.jface.viewers.ITreeContentProvider;\r
 import org.eclipse.jface.viewers.Viewer;\r
 \r
-import eu.etaxonomy.cdm.api.service.IDescriptionService;\r
+import eu.etaxonomy.cdm.api.service.ITermService;\r
 import eu.etaxonomy.cdm.model.common.Marker;\r
 import eu.etaxonomy.cdm.model.common.MarkerType;\r
 import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
@@ -25,6 +25,13 @@ import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
 import eu.etaxonomy.taxeditor.store.TermStore;\r
 \r
+/**\r
+ * The context manager mediates context start/stop and workbench shutdowns to all registered listeners.\r
+ *\r
+ * @author a.theys     \r
+ * @created mar 13, 2012\r
+ * @version 1.0\r
+ */\r
 public class UsesContentProvider implements ITreeContentProvider {\r
 \r
        private static final Object[] NO_CHILDREN = new Object[0];\r
@@ -124,29 +131,19 @@ public class UsesContentProvider implements ITreeContentProvider {
         * @param parentElement\r
         * @return\r
         */\r
-       //CdmStore.getService(IDescriptionService.class).listTaxonDescriptions(input.getTaxonNode().getTaxon(), null, null, null, null, null, null)\r
        private List<DescriptionBase> getDescriptions(TaxonEditorInput parentElement) {\r
-               //this.markerTypes.addAll(CdmStore.getTermManager().getPreferredMarkerTypes());\r
                this.markerTypes.addAll(CdmStore.getTermManager().getPreferredTerms(MarkerType.class));\r
                Taxon taxon = parentElement.getTaxon();\r
-               Set<MarkerType> typesToDisdplay = new HashSet<MarkerType>();\r
                List<DescriptionBase> descriptions = new ArrayList<DescriptionBase>();\r
-               List<TaxonDescription> usesDescriptions = new ArrayList<TaxonDescription>();\r
                \r
-               /*for (MarkerType markerType : markerTypes) {\r
-                       if (markerType.toString().equals("complete")) {\r
-                               typesToDisdplay.add(markerType);\r
-                       }\r
-               }*/\r
-               //usesDescriptions = CdmStore.getService(IDescriptionService.class).listTaxonDescriptions(taxon, null, null, typesToDisdplay, null, null, null);\r
-               //for(DescriptionBase description : CdmStore.getService(IDescriptionService.class).listTaxonDescriptions(taxon, null, null, typesToDisdplay, null, null, null)){\r
-               for(DescriptionBase description : taxon.getDescriptions()){\r
+       for(DescriptionBase description : taxon.getDescriptions()){\r
                        if(! description.isImageGallery()){\r
+                               MarkerType useMarkertype = (MarkerType) CdmStore.getService(ITermService.class).find(UUID.fromString("2e6e42d9-e92a-41f4-899b-03c0ac64f039"));\r
                                Set<Marker> descriptionMarkers = description.getMarkers();\r
                                if(descriptionMarkers != null) {\r
                                        for (Marker marker: descriptionMarkers) {\r
                                                //TODO Use the GetbyUUID method\r
-                                               if(marker.getMarkerType().getTitleCache().equals("use")) {\r
+                                               if(marker.getMarkerType().equals(useMarkertype)) {\r
                                                        descriptions.add(description);\r
                                                }\r
                                        }\r