From: a.theys Date: Wed, 18 Jan 2012 08:49:50 +0000 (+0000) Subject: AT: Comminting updates to comply to TaxEditor CDMStore functions X-Git-Tag: 3.6.0~1060^2~52 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/6fbdb182b1e85a78b05d98a7481f652922ed6889 AT: Comminting updates to comply to TaxEditor CDMStore functions --- diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath index f98f7248b..99aacc09e 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/.classpath +++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath @@ -1,111 +1,119 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 307f026de..7eae64139 100644 --- 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 @@ -14,6 +14,7 @@ import eu.etaxonomy.cdm.api.service.IDescriptionService; import eu.etaxonomy.cdm.model.common.Marker; import eu.etaxonomy.cdm.model.common.MarkerType; import eu.etaxonomy.cdm.model.description.DescriptionBase; +import eu.etaxonomy.cdm.model.description.Feature; import eu.etaxonomy.cdm.model.description.FeatureTree; import eu.etaxonomy.cdm.model.description.TaxonDescription; import eu.etaxonomy.cdm.model.taxon.Taxon; @@ -115,7 +116,7 @@ public class UsesContentProvider implements ITreeContentProvider { // create a transient tree with all features if none was selected if(featureTree == null){ - featureTree = FeatureTree.NewInstance(TermStore.getFeatures()); + featureTree = FeatureTree.NewInstance(TermStore.getTerms(Feature.class)); } return featureTree; @@ -129,7 +130,8 @@ public class UsesContentProvider implements ITreeContentProvider { */ //CdmStore.getService(IDescriptionService.class).listTaxonDescriptions(input.getTaxonNode().getTaxon(), null, null, null, null, null, null) private List getDescriptions(TaxonEditorInput parentElement) { - this.markerTypes.addAll(CdmStore.getTermManager().getPreferredMarkerTypes()); + //this.markerTypes.addAll(CdmStore.getTermManager().getPreferredMarkerTypes()); + this.markerTypes.addAll(CdmStore.getTermManager().getPreferredTerms(MarkerType.class)); Taxon taxon = parentElement.getTaxon(); Set typesToDisdplay = new HashSet(); List descriptions = new ArrayList(); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/handler/DynamicFeatureMenu.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/handler/DynamicFeatureMenu.java index a12fd2ea6..dd3b9047d 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/handler/DynamicFeatureMenu.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/handler/DynamicFeatureMenu.java @@ -37,6 +37,7 @@ import eu.etaxonomy.taxeditor.editor.view.uses.operation.CreateTaxonUseOperation import eu.etaxonomy.taxeditor.model.FeatureNodeContainer; import eu.etaxonomy.taxeditor.preference.PreferencesUtil; import eu.etaxonomy.taxeditor.store.CdmStore; +import eu.etaxonomy.taxeditor.store.TermStore; /** *

DynamicFeatureMenu class.

@@ -135,7 +136,8 @@ public class DynamicFeatureMenu extends CompoundContributionItem { } if(featureTree == null){ - featureTree = FeatureTree.NewInstance(CdmStore.getTermManager().getPreferredFeatures()); + //featureTree = FeatureTree.NewInstance(CdmStore.getTermManager().getPreferredFeatures()); + featureTree = FeatureTree.NewInstance(CdmStore.getTermManager().getPreferredTerms(Feature.class)); } return featureTree; diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateTaxonUseOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateTaxonUseOperation.java index d7e47cfc6..b8ca26e8e 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateTaxonUseOperation.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateTaxonUseOperation.java @@ -64,7 +64,8 @@ public class CreateTaxonUseOperation extends AbstractPostOperation { description = TaxonDescription.NewInstance(taxon); monitor.worked(20); - this.markerTypes.addAll(CdmStore.getTermManager().getPreferredMarkerTypes()); + //this.markerTypes.addAll(CdmStore.getTermManager().getPreferredMarkerTypes()); + this.markerTypes.addAll(CdmStore.getTermManager().getPreferredTerms(MarkerType.class)); Set typesToDisdplay = new HashSet(); for (MarkerType markerType : markerTypes) { if (markerType.getTitleCache().equals("use")) { diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF index f81f87428..e875c32e0 100644 --- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF @@ -51,7 +51,6 @@ Export-Package: eu.etaxonomy.cdm, Require-Bundle: org.eclipse.osgi, org.eclipse.ui, org.eclipse.jface.text, - org.eclipse.pde.runtime, org.eclipse.ui.forms, eu.etaxonomy.taxeditor.cdmlib Import-Package: org.eclipse.core.commands,