Set getRootTaxa back to "show root taxa with no children" - test users were befuddled.

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/TaxEditorPlugin.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/TaxEditorPlugin.java
index dc5e46363c5385b94ecaf533bfac6567cdadefb2..f0671ac4e2afcdbc7905df0bebb03d781c702ed8 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/TaxEditorPlugin.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/TaxEditorPlugin.java
@@ -250,21 +250,6 @@ public class TaxEditorPlugin extends AbstractUIPlugin {
        public CdmApplicationController getCdmApp() {\r
                if (cdmApp == null) {\r
                        try {\r
-//                             cdmApp.getDatabaseService().getDatabaseEnum();\r
-//                             cdmApp.getDatabaseService().saveDataSource(strDataSourceName, databaseTypeEnum, server, database, username, password)\r
-                               \r
-//                             // Open ds by string\r
-//                             CdmPersistentDataSource ds = CdmPersistentDataSource.NewInstance(dataSourceName)\r
-//                             \r
-//                             // Open default instance\r
-//                             CdmPersistentDataSource ds = CdmPersistentDataSource.NewDefaultInstance();\r
-//                             \r
-//                             CdmPersistentDataSource.getAllDataSources();\r
-//                             \r
-//                             // Open CdmApp w default DB\r
-//                             CdmApplicationController.NewInstance(dbSchemaValidation);\r
-                               \r
-//                             System.exit(-1);\r
                                \r
                                cdmDatasource = \r
                                                CdmDataSource.NewH2EmbeddedInstance("cdm", "sa", "");\r
@@ -516,7 +501,7 @@ public class TaxEditorPlugin extends AbstractUIPlugin {
         * TAXONOMIC TREE\r
         **************************************************************************/\r
 \r
-       public ReferenceBase getSec() {\r
+       public ReferenceBase getSessionDefaultSec() {\r
                return getCdmApp().getReferenceService().getReferenceByUuid(\r
                                UUID.fromString("f3593c18-a8d2-4e51-bdad-0befbf8fb2d1"));\r
        }\r
@@ -537,13 +522,15 @@ public class TaxEditorPlugin extends AbstractUIPlugin {
        private HashMap<Taxon, Set<Taxon>> sessionTaxonomicChildrenMap;\r
 \r
        public Set<Taxon> getSessionRootTaxa() {\r
+               \r
+               boolean ROOT_TAXA_ONLY_W_CHILDREN = true;\r
+               boolean ROOT_TAXA_W_NO_CHILDREN_ALLOWED = false;\r
+               \r
                if (sessionRootTaxa == null) {\r
                        \r
                        sessionRootTaxa = new HashSet<Taxon>();\r
-//                     sessionRootTaxa.addAll(getCdmApp().getTaxonService().getRootTaxa(\r
-//                                     getSec(), null, false));\r
                        sessionRootTaxa.addAll(getCdmApp().getTaxonService().getRootTaxa(\r
-                                       getSec(), null, true));                 \r
+                                       getSessionDefaultSec(), null, ROOT_TAXA_W_NO_CHILDREN_ALLOWED));                        \r
                        addSessionTaxa(sessionRootTaxa);\r
                                                \r
                }\r
@@ -740,7 +727,7 @@ public class TaxEditorPlugin extends AbstractUIPlugin {
         * SORAYA DATA\r
         **************************************************************************/\r
        private Taxon getSorayasGenusTaxon() {\r
-\r
+               \r
                String[] children = new String[] {\r
                                "Heterospathe annectens H.E.Moore",\r
                                "Heterospathe arfakiana (Becc.) H.E.Moore",\r