commit 845a6a7083192de9f4e3d951ecce274bc29c06a1
Author: Patrick Plitzner
Date: Thu Jul 25 17:42:25 2019 +0200
ref #6794 Replace FeatureTreeService with TermTreeService
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterEditor.java
index 212ce6d46..876a030b0 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterEditor.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterEditor.java
@@ -55,8 +55,8 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
import eu.etaxonomy.cdm.api.service.IFeatureNodeService;
-import eu.etaxonomy.cdm.api.service.IFeatureTreeService;
import eu.etaxonomy.cdm.api.service.ITermService;
+import eu.etaxonomy.cdm.api.service.ITermTreeService;
import eu.etaxonomy.cdm.api.service.IVocabularyService;
import eu.etaxonomy.cdm.model.description.Character;
import eu.etaxonomy.cdm.model.description.Feature;
@@ -333,7 +333,7 @@ public class CharacterEditor implements IFeatureTreeEditor,IConversationEnabled,
//save characters because they can be modified in this editor
featureTree.getDistinctTerms().forEach(character->CdmStore.getService(ITermService.class).merge(character,true));
}
- CdmStore.getService(IFeatureTreeService.class).saveOrUpdate(featureTree);
+ CdmStore.getService(ITermTreeService.class).saveOrUpdate(featureTree);
dirty.setDirty(false);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditor.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditor.java
index 88b1bf7c7..07e0f42e4 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditor.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditor.java
@@ -45,8 +45,8 @@ import org.eclipse.ui.IMemento;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
-import eu.etaxonomy.cdm.api.service.IFeatureTreeService;
import eu.etaxonomy.cdm.api.service.ITermService;
+import eu.etaxonomy.cdm.api.service.ITermTreeService;
import eu.etaxonomy.cdm.model.description.Character;
import eu.etaxonomy.cdm.model.description.Feature;
import eu.etaxonomy.cdm.model.term.TermNode;
@@ -136,7 +136,7 @@ public class FeatureTreeEditor implements IFeatureTreeEditor, ISelectionChangedL
}
});
- List trees = CdmStore.getService(IFeatureTreeService.class).list(TermTree.class, null, null, null, null);
+ List trees = CdmStore.getService(ITermTreeService.class).list(TermTree.class, null, null, null, null);
viewer.setComparator(new FeatureTreeViewerComparator());
viewer.setInput(trees);
@@ -249,7 +249,7 @@ public class FeatureTreeEditor implements IFeatureTreeEditor, ISelectionChangedL
// commit the conversation and start a new transaction immediately
conversation.commit(true);
- CdmStore.getService(IFeatureTreeService.class).saveOrUpdate((List)getRootEntities());
+ CdmStore.getService(ITermTreeService.class).saveOrUpdate((List)getRootEntities());
List> rootEntities = getRootEntities();
for (TermTree featureTree : rootEntities) {
@@ -268,7 +268,7 @@ public class FeatureTreeEditor implements IFeatureTreeEditor, ISelectionChangedL
private void initializeTrees() {
Object[] expandedElements = viewer.getExpandedElements();
viewer.getTree().removeAll();
- List trees = CdmStore.getService(IFeatureTreeService.class).list(TermTree.class, null, null, null, null);
+ List trees = CdmStore.getService(ITermTreeService.class).list(TermTree.class, null, null, null, null);
viewer.setInput(trees);
viewer.setExpandedElements(expandedElements);
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/CreateFeatureTreeOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/CreateFeatureTreeOperation.java
index 398960246..a940d45f7 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/CreateFeatureTreeOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/CreateFeatureTreeOperation.java
@@ -13,7 +13,7 @@ import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import eu.etaxonomy.cdm.api.service.IFeatureTreeService;
+import eu.etaxonomy.cdm.api.service.ITermTreeService;
import eu.etaxonomy.cdm.model.description.Feature;
import eu.etaxonomy.cdm.model.term.TermTree;
import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
@@ -36,7 +36,7 @@ public class CreateFeatureTreeOperation extends AbstractPostOperationupdateButtons());
- List> trees = (List)CdmStore.getService(IFeatureTreeService.class).list(TermTree.class, null, null, null, null);
+ List> trees = (List)CdmStore.getService(ITermTreeService.class).list(TermTree.class, null, null, null, null);
composite.getSelectFeatureTreeComposite().getViewer().setInput(trees);
composite.getSelectFeatureTreeComposite().getViewer().addCheckStateListener(e->updateButtons());
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java
index 6b9175e65..8292190f0 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java
@@ -23,7 +23,7 @@ import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import eu.etaxonomy.cdm.api.service.IFeatureTreeService;
+import eu.etaxonomy.cdm.api.service.ITermTreeService;
import eu.etaxonomy.cdm.model.description.Feature;
import eu.etaxonomy.cdm.model.term.TermTree;
import eu.etaxonomy.taxeditor.featuretree.FeatureTreeContentProvider;
@@ -83,7 +83,7 @@ public class DefaultFeatureTreePreferenecs extends CdmPreferencePage {
}
});
- List> input = (List)CdmStore.getService(IFeatureTreeService.class).list(TermTree.class, null, null, null, null);
+ List> input = (List)CdmStore.getService(ITermTreeService.class).list(TermTree.class, null, null, null, null);
viewer.setInput(input);
@@ -114,7 +114,7 @@ public class DefaultFeatureTreePreferenecs extends CdmPreferencePage {
}
});
- List> input = (List)CdmStore.getService(IFeatureTreeService.class).list(TermTree.class, null, null, null, null);
+ List> input = (List)CdmStore.getService(ITermTreeService.class).list(TermTree.class, null, null, null, null);
viewer.setInput(input);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
index fc6b8236a..d5c5311df 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
@@ -41,8 +41,8 @@ import org.osgi.service.prefs.Preferences;
import eu.etaxonomy.cdm.api.application.ICdmRepository;
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeConfigurator;
-import eu.etaxonomy.cdm.api.service.IFeatureTreeService;
import eu.etaxonomy.cdm.api.service.ITermService;
+import eu.etaxonomy.cdm.api.service.ITermTreeService;
import eu.etaxonomy.cdm.api.service.config.FindTaxaAndNamesConfiguratorImpl;
import eu.etaxonomy.cdm.api.service.config.IFindTaxaAndNamesConfigurator;
import eu.etaxonomy.cdm.common.CdmUtils;
@@ -969,7 +969,7 @@ public class PreferencesUtil implements IPreferenceKeys {
return null;
}
TermTree tree = CdmStore.getService(
- IFeatureTreeService.class).load(UUID.fromString(uuidString));
+ ITermTreeService.class).load(UUID.fromString(uuidString));
if (tree.getId() == 0) {
return null;
}
@@ -980,7 +980,7 @@ public class PreferencesUtil implements IPreferenceKeys {
String uuidString = getStringValue(
FEATURE_TREE_DEFAULT_STRUCTURE);
return StringUtils.isBlank(uuidString) ? null : CdmStore.getService(
- IFeatureTreeService.class).load(UUID.fromString(uuidString));
+ ITermTreeService.class).load(UUID.fromString(uuidString));
}
public static void setSortRanksHierarchichally(boolean selection) {
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
index 398ea677c..87c34dc8c 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
@@ -36,10 +36,9 @@ import eu.etaxonomy.cdm.api.service.IClassificationService;
import eu.etaxonomy.cdm.api.service.ICollectionService;
import eu.etaxonomy.cdm.api.service.ICommonService;
import eu.etaxonomy.cdm.api.service.IDescriptionService;
+import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService;
import eu.etaxonomy.cdm.api.service.IEntityConstraintViolationService;
import eu.etaxonomy.cdm.api.service.IEntityValidationService;
-import eu.etaxonomy.cdm.api.service.IFeatureNodeService;
-import eu.etaxonomy.cdm.api.service.IFeatureTreeService;
import eu.etaxonomy.cdm.api.service.IGrantedAuthorityService;
import eu.etaxonomy.cdm.api.service.IGroupService;
import eu.etaxonomy.cdm.api.service.IMarkerService;
@@ -53,10 +52,11 @@ import eu.etaxonomy.cdm.api.service.IRegistrationService;
import eu.etaxonomy.cdm.api.service.IRightsService;
import eu.etaxonomy.cdm.api.service.IService;
import eu.etaxonomy.cdm.api.service.ITaxonService;
+import eu.etaxonomy.cdm.api.service.ITermNodeService;
import eu.etaxonomy.cdm.api.service.ITermService;
+import eu.etaxonomy.cdm.api.service.ITermTreeService;
import eu.etaxonomy.cdm.api.service.IUserService;
import eu.etaxonomy.cdm.api.service.IVocabularyService;
-import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService;
import eu.etaxonomy.cdm.api.service.molecular.IAmplificationService;
import eu.etaxonomy.cdm.api.service.molecular.IPrimerService;
import eu.etaxonomy.cdm.cache.CdmRemoteCacheManager;
@@ -65,16 +65,12 @@ import eu.etaxonomy.cdm.database.DbSchemaValidation;
import eu.etaxonomy.cdm.model.agent.AgentBase;
import eu.etaxonomy.cdm.model.common.Annotation;
import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.term.DefinedTermBase;
import eu.etaxonomy.cdm.model.common.Group;
import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.term.TermVocabulary;
import eu.etaxonomy.cdm.model.description.DescriptionBase;
-import eu.etaxonomy.cdm.model.term.TermNode;
-import eu.etaxonomy.cdm.model.term.TermTree;
+import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
import eu.etaxonomy.cdm.model.description.PolytomousKey;
import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
-import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
import eu.etaxonomy.cdm.model.media.Media;
import eu.etaxonomy.cdm.model.media.Rights;
import eu.etaxonomy.cdm.model.molecular.Amplification;
@@ -86,6 +82,10 @@ import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.cdm.model.taxon.Classification;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermNode;
+import eu.etaxonomy.cdm.model.term.TermTree;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
import eu.etaxonomy.cdm.model.validation.EntityConstraintViolation;
import eu.etaxonomy.cdm.model.validation.EntityValidation;
import eu.etaxonomy.cdm.persistence.hibernate.permission.CRUD;
@@ -729,10 +729,10 @@ public class CdmStore {
service = (IService) getService(IEntityValidationService.class);
}
else if (cdmBase instanceof TermNode) {
- service = (IService) getService(IFeatureNodeService.class);
+ service = (IService) getService(ITermNodeService.class);
}
else if (cdmBase instanceof TermTree) {
- service = (IService) getService(IFeatureTreeService.class);
+ service = (IService) getService(ITermTreeService.class);
}
else if (cdmBase instanceof GrantedAuthority) {
service = (IService) getService(IGrantedAuthorityService.class);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/UseObjectStore.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/UseObjectStore.java
index 4afffe86b..5d148df32 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/UseObjectStore.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/UseObjectStore.java
@@ -17,20 +17,20 @@ import org.eclipse.core.runtime.NullProgressMonitor;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.ITermService;
import eu.etaxonomy.cdm.api.service.IVocabularyService;
-import eu.etaxonomy.cdm.model.term.DefinedTerm;
import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.term.TermType;
-import eu.etaxonomy.cdm.model.term.TermVocabulary;
import eu.etaxonomy.cdm.model.description.Feature;
import eu.etaxonomy.cdm.model.description.State;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
/**
- * A store to handle all terms and vocabulary required for
+ * A store to handle all terms and vocabulary required for
* the UseObjects view and components.
* Whenever one of the terms is requested, all required terms are generated
- * in the database as we consider the requests as an indicator that
+ * in the database as we consider the requests as an indicator that
* someone wants to use the terms.
- * This
+ * This
* @author a.theys
* @author a.mueller
* @created mar 13, 2012
@@ -38,40 +38,40 @@ import eu.etaxonomy.cdm.model.description.State;
public class UseObjectStore {
private static boolean isInitialized;
-
+
private static MarkerType useMarkerType;
private static Feature useSummaryFeature;
private static Feature useRecordFeature;
-
-
+
+
public static void reset() {
isInitialized = false;
useMarkerType = null;
useSummaryFeature = null;
useRecordFeature = null;
}
-
+
public static MarkerType getUseMarkerType() {
initialize();
return useMarkerType;
}
-
+
public static Feature getUseSummaryFeature() {
initialize();
return useSummaryFeature;
}
-
+
public static Feature getUseRecordFeature() {
initialize();
return useRecordFeature;
}
-
+
private static void initialize(){
setupNecessaryItems(null);
isInitialized = true;
}
-
+
private static void setupNecessaryItems( IProgressMonitor monitor ) {
if (isInitialized){
return;
@@ -80,14 +80,14 @@ public class UseObjectStore {
//TODO can we use a better one?
monitor = new NullProgressMonitor();
}
-
+
ConversationHolder conversation = CdmStore.createConversation();
-
+
//retrieve terms and vocabularies from db
useRecordFeature = (Feature) CdmStore.getService(ITermService.class).find(UsageTermCollection.uuidUseRecordFeature);
useSummaryFeature = (Feature) CdmStore.getService(ITermService.class).find(UsageTermCollection.uuidUseSummaryFeature);
-
+
//create use marker type if not exists
createUseMarkerType(conversation);
@@ -106,14 +106,14 @@ public class UseObjectStore {
if(useRecordFeature == null || useSummaryFeature == null) {
TermVocabulary featureVocabulary = CdmStore.getService(IVocabularyService.class).find((UsageTermCollection.uuidFeatureVocabulary));
-// FeatureTree palmWebFeatureTree = CdmStore.getService(IFeatureTreeService.class).find(UsageTermCollection.uuidPalmWebFeatureTree);
+// FeatureTree palmWebFeatureTree = CdmStore.getService(ITermTreeService.class).find(UsageTermCollection.uuidPalmWebFeatureTree);
if (useRecordFeature == null ) {
useRecordFeature = Feature.NewInstance(UsageTermCollection.useRecordFeatureLabel, UsageTermCollection.useRecordFeatureLabel, null);
useRecordFeature.setUuid(UsageTermCollection.uuidUseRecordFeature);
useRecordFeature.setSupportsCategoricalData(true);
featureVocabulary.addTerm(useRecordFeature);
-
+
// if (palmWebFeatureTree != null){
// FeatureNode useRecFeatureNode = FeatureNode.NewInstance(featureUseRecord);
// palmWebFeatureTree.getRoot().addChild(useRecFeatureNode);
@@ -136,7 +136,7 @@ public class UseObjectStore {
CdmStore.getService(IVocabularyService.class).saveOrUpdate(featureVocabulary);
// if (palmWebFeatureTree != null){
-// CdmStore.getService(IFeatureTreeService.class).saveOrUpdate(palmWebFeatureTree);
+// CdmStore.getService(ITermTreeService.class).saveOrUpdate(palmWebFeatureTree);
// }
conversation.commit(true);