Adapt to service layer change

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterDropAdapter.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterDropAdapter.java
index 319992344411f8157ad72bc6d3e3b30aa953ebf4..9e733912d9f3918b914d9c8715e21cefb5102e70 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterDropAdapter.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterDropAdapter.java
@@ -64,7 +64,7 @@ public class CharacterDropAdapter extends FeatureTreeDropAdapter {
                         //drop on feature tree
                         target = ((FeatureTree)getViewer().getInput()).getRoot();
                     }
                         //drop on feature tree
                         target = ((FeatureTree)getViewer().getInput()).getRoot();
                     }

-                    CdmStore.getService(IFeatureNodeService.class).createChildFeatureNode(target, character, characterEditor.getVocabulary().getUuid());
+                    CdmStore.getService(IFeatureNodeService.class).createChildFeatureNode(target.getUuid(), character, characterEditor.getVocabulary().getUuid());

                    }
                }
                getViewer().refresh();
                    }
                }
                getViewer().refresh();

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 13d6b71dabb1452bdf45f6294cfe3467330681de..0c549f6bec50e3ffbd98cc3eb0fbbdaab80b9757 100644 (file)
--- 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
@@ -193,7 +193,6 @@ public class CharacterEditor implements IFeatureTreeEditor,IConversationEnabled,
 
         propertiesTreeEditorComposite = addFeatureTreeEditor(composite_1);
         initFeatureTreeComposite(TermType.Property, propertiesTreeEditorComposite,
 
         propertiesTreeEditorComposite = addFeatureTreeEditor(composite_1);
         initFeatureTreeComposite(TermType.Property, propertiesTreeEditorComposite,

-

                 new CharacterDragListener(structuresTreeEditorComposite.getViewer(), propertiesTreeEditorComposite.getViewer()),
                 null,
                 new Transfer[] {CharacterTransfer.getInstance()},
                 new CharacterDragListener(structuresTreeEditorComposite.getViewer(), propertiesTreeEditorComposite.getViewer()),
                 null,
                 new Transfer[] {CharacterTransfer.getInstance()},


@@ -227,10 +226,10 @@ public class CharacterEditor implements IFeatureTreeEditor,IConversationEnabled,
                     return;
                 }
                 Collection<Character> characters = createCharacters((TreeSelection)structureTreeSelection, (TreeSelection)propertyTreeSelection);
                     return;
                 }
                 Collection<Character> characters = createCharacters((TreeSelection)structureTreeSelection, (TreeSelection)propertyTreeSelection);

+                FeatureNode<Character> parent = ((FeatureTree<Character>) characterTreeEditorComposite.getViewer().getInput()).getRoot();

                 for (Character character : characters) {
                     //add new Character to feature tree
                 for (Character character : characters) {
                     //add new Character to feature tree

-                    FeatureNode<Character> parent = ((FeatureTree<Character>) characterTreeEditorComposite.getViewer().getInput()).getRoot();
-                    CdmStore.getService(IFeatureNodeService.class).createChildFeatureNode(parent, character, vocabulary.getUuid());
+                    CdmStore.getService(IFeatureNodeService.class).createChildFeatureNode(parent.getUuid(), character, vocabulary.getUuid());

                 }
                 characterTreeEditorComposite.getViewer().refresh();
             }
                 }
                 characterTreeEditorComposite.getViewer().refresh();
             }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/AddOntologyTermOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/AddOntologyTermOperation.java
index 0fe066f664f3748ccbdf60d9f4575eb7cd353d74..64dd5929f75ee9816f9cf99757a56cc7cccc4b71 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/AddOntologyTermOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/AddOntologyTermOperation.java
@@ -50,7 +50,7 @@ public class AddOntologyTermOperation extends AbstractPostOperation<FeatureNode>
     public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
         Feature feature = Feature.NewInstance(wrapper.getDescription(), wrapper.getLabel(), null);
         feature.setUri(URI.create(wrapper.getUri()));
     public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
         Feature feature = Feature.NewInstance(wrapper.getDescription(), wrapper.getLabel(), null);
         feature.setUri(URI.create(wrapper.getUri()));

-        CdmStore.getService(IFeatureNodeService.class).createChildFeatureNode(target, feature, vocabulary.getUuid());
+        CdmStore.getService(IFeatureNodeService.class).createChildFeatureNode(target.getUuid(), feature, vocabulary.getUuid());

 
         UpdateResult updateResult = CdmStore.getService(IFeatureNodeService.class).addChildFeatureNode(target.getUuid(), element.getUuid());
         return postExecute(updateResult.getCdmEntity());
 
         UpdateResult updateResult = CdmStore.getService(IFeatureNodeService.class).addChildFeatureNode(target.getUuid(), element.getUuid());
         return postExecute(updateResult.getCdmEntity());