migrating to cdmlib-plugin 2.0.0.20 including new term loading

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

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmSessionDataRepository.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmSessionDataRepository.java
index 5bfc0de3f10740ef1214f24bd615abdd365d34e2..86229872e41bf74b6d33502e462f62639dbabd2b 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmSessionDataRepository.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmSessionDataRepository.java
@@ -97,13 +97,13 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
                getObservableTaxa().addSetChangeListener(new observableTaxaListener());\r
        }\r
        \r
-       @Override\r
+       \r
        public void clearAllData() {\r
                clearTaxonData();\r
                clearNonTaxonData();\r
        }\r
 \r
-       @Override\r
+       \r
        public void clearTaxonData() {\r
                removeAllTaxa();\r
                \r
@@ -111,7 +111,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
                RecentNamesView.clearRecentNames();\r
        }\r
 \r
-       @Override\r
+       \r
        public void clearNonTaxonData() {\r
                features = null;\r
                ranks = null;\r
@@ -124,7 +124,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
                CdmParserController.clearNonViralNameParser();\r
        }\r
 \r
-       @Override\r
+       \r
        public void setApplicationController(CdmApplicationController applicationController) {\r
                this.applicationController = applicationController;\r
        }\r
@@ -144,19 +144,19 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
                return applicationController;\r
        }\r
 \r
-       @Override\r
+       \r
        public ReferenceBase getDefaultSec() {\r
                // TODO why is this returning null? and of course, replace w the real deal\r
                return getApplicationController().getReferenceService().getReferenceByUuid(\r
                                UUID.fromString("f3593c18-a8d2-4e51-bdad-0befbf8fb2d1"));\r
        }\r
 \r
-       @Override\r
+       \r
        public Set<Taxon> getRootTaxa() {\r
                return getTaxonomicChildren(null);\r
        }\r
        \r
-       @Override\r
+       \r
        public Set<Taxon> getTaxonomicChildren(Taxon parentTaxon) {\r
                                \r
                // Check whether the map contains children for parentTaxon\r
@@ -218,7 +218,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
                getObservableTaxa().add(taxon);\r
        }\r
        \r
-       @Override\r
+       \r
        public void addTaxon(Taxon taxon) {\r
                                \r
                // Add taxon to its parent's child map\r
@@ -229,7 +229,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
                addTaxonIntern(taxon);\r
        }\r
 \r
-       @Override\r
+       \r
        public IObservableSet getObservableTaxa() {\r
                if (observableTaxonSet == null) {\r
                        Realm realm = SWTObservables.getRealm(Display.getDefault());\r
@@ -238,7 +238,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
                return observableTaxonSet;\r
        }\r
 \r
-       @Override\r
+       \r
        public boolean deleteTaxon(Taxon taxon) {\r
                \r
                // Remove taxon from repository collections\r
@@ -268,7 +268,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
                }\r
        }\r
 \r
-       @Override\r
+       \r
        public void removeTaxon(Taxon taxon) {\r
                \r
                // Recursively remove all children, children's children, etc.\r
@@ -303,19 +303,19 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
                }\r
        }\r
 \r
-       @Override\r
+       \r
        public Collection<Taxon> getAllTaxa() {\r
                return getObservableTaxa();\r
        }\r
        \r
-       @Override\r
+       \r
        public void removeAllTaxa() {\r
                taxonomicChildrenMap.clear();\r
                observableTaxonSet.clear();\r
        }\r
 \r
 \r
-       @Override\r
+       \r
        public boolean saveTaxon(Taxon taxon) {\r
                \r
                // If this is not in the list of observable taxa, add\r
@@ -337,7 +337,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
                return observableTaxonSet.contains(taxon);\r
        }\r
 \r
-       @Override\r
+       \r
        public void setTaxonomicParent(Taxon taxon, Taxon newParentTaxon) {\r
                \r
                // Get old taxonomic parent\r
@@ -358,7 +358,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
                }\r
        }\r
        \r
-       @Override\r
+       \r
        public TermVocabulary<Feature> getFeatures() {\r
                if (features == null) {\r
                        features = getApplicationController().getDescriptionService().\r
@@ -367,7 +367,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
                return features;\r
        }\r
        \r
-       @Override\r
+       \r
        public SortedSet<Rank> getRanks() {\r
                if (ranks == null) {\r
                        \r
@@ -378,7 +378,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
                return ranks;\r
        }\r
 \r
-       @Override\r
+       \r
        public TermVocabulary<NomenclaturalStatusType> getNomStatus() {\r
                if (nomStatus == null) {\r
                        nomStatus = getApplicationController().getNameService()\r
@@ -387,7 +387,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
                return nomStatus;\r
        }\r
        \r
-       @Override\r
+       \r
        public SortedSet<NameRelationshipType> getNameRelationshipTypes() {\r
                if (nameRelationshipTypes == null) {\r
                        TermVocabulary<NameRelationshipType> nameRelationshipTypesUnsorted = \r
@@ -407,7 +407,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
                return nameRelationshipTypes;\r
        }\r
        \r
-       @Override\r
+       \r
        public void addTaxonSetListener(ICdmTaxonSetListener listener) {\r
                \r
                if (listeners == null) { \r
@@ -417,7 +417,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
        }\r
        \r
        class observableTaxaListener implements ISetChangeListener {\r
-               @Override\r
+               \r
                public void handleSetChange(SetChangeEvent event) {\r
                        if (event.diff != null) {\r
                                Set<Taxon> additions = event.diff.getAdditions();\r
@@ -439,7 +439,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
                }               \r
        }\r
 \r
-       @Override\r
+       \r
        public OrderedTermVocabulary<TaxonRelationshipType> getTaxonRelationshipTypes() {\r
                if (taxonRelationshipTypes == null) {\r
                        taxonRelationshipTypes = getApplicationController().getTaxonService().\r
@@ -448,7 +448,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
                return taxonRelationshipTypes;\r
        }\r
 \r
-       @Override\r
+       \r
        public Set<TaxonRelationshipType> getConceptRelationshipTypes() {\r
                if (conceptRelationshipTypes == null) {\r
                        conceptRelationshipTypes = getTaxonRelationshipTypes().getTerms();\r