fix NPE bug and termloading bug for Usage Records #4247

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / view / uses / operation / CreateTaxonUseOperation.java

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 8f1c8084981009f005b0e24055b46ce60361cec3..b32d73f224fd0d42c4c576b01598caa172ecbee7 100644 (file)
--- 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
@@ -14,15 +14,13 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;\r
 import org.eclipse.core.runtime.IStatus;\r
 \r
-import eu.etaxonomy.cdm.api.service.ITermService;\r
 import eu.etaxonomy.cdm.model.common.Marker;\r
 import eu.etaxonomy.cdm.model.common.MarkerType;\r
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.editor.UsageTermCollection;\r
 import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.CreateTaxonDescriptionOperation;\r
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
-import eu.etaxonomy.taxeditor.store.CdmStore;\r
+import eu.etaxonomy.taxeditor.store.UseObjectStore;\r
 \r
 /**\r
  * CreateTaxonUseOperation Class\r
@@ -61,9 +59,7 @@ public class CreateTaxonUseOperation extends CreateTaxonDescriptionOperation {
                super(label, undoContext, taxon, postOperationEnabled);\r
        }\r
 \r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)\r
-        */\r
+\r
        /** {@inheritDoc} */\r
        @Override\r
        public IStatus execute(IProgressMonitor monitor, IAdaptable info)\r
@@ -71,7 +67,7 @@ public class CreateTaxonUseOperation extends CreateTaxonDescriptionOperation {
 \r
                description = TaxonDescription.NewInstance(element);\r
                monitor.worked(20);\r
-               MarkerType useMarkerType = (MarkerType) CdmStore.getService(ITermService.class).find(UsageTermCollection.uuidUseMarkerType);\r
+               MarkerType useMarkerType = UseObjectStore.getUseMarkerType();\r
                marker = Marker.NewInstance(useMarkerType, true);\r
                description.addMarker(marker);\r
                monitor.worked(40);\r