.

[taxeditor.git] / eclipseprojects / eu.etaxonomy.taxeditor / src / eu / etaxonomy / taxeditor / model / NameTreeContentProvider.java

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/NameTreeContentProvider.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/NameTreeContentProvider.java
index 76b3c1b7aec74a8caabacc4778d7116143a38ec0..1ee2c0f07c0c04143c4671d721bf253c6f87feab 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/NameTreeContentProvider.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/NameTreeContentProvider.java
@@ -1,7 +1,17 @@
+/**\r
+* Copyright (C) 2007 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+\r
 package eu.etaxonomy.taxeditor.model;\r
 \r
 import java.util.Set;\r
 \r
+import org.apache.log4j.Logger;\r
 import org.eclipse.core.databinding.observable.Realm;\r
 import org.eclipse.core.databinding.observable.list.IListChangeListener;\r
 import org.eclipse.core.databinding.observable.list.IObservableList;\r
@@ -18,6 +28,7 @@ import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.widgets.Display;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
+import eu.etaxonomy.taxeditor.TaxEditorPlugin;\r
 import eu.etaxonomy.taxeditor.view.TaxonomicTreeViewer;\r
 \r
 /**\r
@@ -26,13 +37,21 @@ import eu.etaxonomy.taxeditor.view.TaxonomicTreeViewer;
  *  viewer type restrictions and private settings of variables and methods\r
  * \r
  * @author p.ciardelli\r
- *\r
+ * @created 14.05.2008\r
+ * @version 1.0\r
  */\r
 public class NameTreeContentProvider extends ObservableListContentProvider \r
                implements ITreeContentProvider {\r
+       private static final Logger logger = Logger.getLogger(NameTreeContentProvider.class);\r
 \r
        public Object[] getChildren(Object parentElement) {\r
-               Set<Taxon> children = ((Taxon) parentElement).getTaxonomicChildren();\r
+               Taxon parentTaxon = (Taxon) parentElement;\r
+//             Set<Taxon> children = TaxEditorPlugin.getDefault().getTaxonomicChildren(parentTaxon);\r
+               Set<Taxon> children = parentTaxon.getTaxonomicChildren();\r
+//             for (Taxon childTaxon : children) {\r
+//                     observableList.add(childTaxon);\r
+//             }\r
+               // TODO: suppress notify\r
                observableList.addAll(children);\r
                return children == null ? new Object[0] : children.toArray();\r
        }\r
@@ -61,7 +80,7 @@ public class NameTreeContentProvider extends ObservableListContentProvider
                                if (entry.isAddition()) {\r
                                        \r
                                        knownElements.add(entry.getElement());\r
-               \r
+                                                       \r
                                        ((TaxonomicTreeViewer) viewer).add(\r
                                                        ((Taxon) entry.getElement()).getTaxonomicParent(), \r
                                                        entry.getElement());\r
@@ -119,15 +138,12 @@ public class NameTreeContentProvider extends ObservableListContentProvider
                if (observableList != null) {\r
                        observableList.removeListChangeListener(listener);\r
                }\r
+               observableList = list;          \r
+               observableList.addListChangeListener(listener);\r
                \r
-               knownElements.clear();\r
-\r
-               observableList = list;\r
-               \r
+               knownElements.clear();          \r
                knownElements.addAll(list);\r
-               \r
 \r
-               observableList.addListChangeListener(listener);\r
        }\r
 \r
        /**\r