adapt character editor to renamed TermTreeComparator

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 59dadba17f0cfe468da359dd542f942afba77caa..875b06e44202bf47600e55cb1fa07dff804f3486 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
@@ -80,7 +80,7 @@ import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
 import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.taxeditor.editor.AppModelId;
-import eu.etaxonomy.taxeditor.editor.definedterm.FeatureTreeViewerComparator;
+import eu.etaxonomy.taxeditor.editor.definedterm.TermTreeViewerComparator;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
 import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
 import eu.etaxonomy.taxeditor.featuretree.CharacterTransfer;
@@ -113,7 +113,7 @@ import eu.etaxonomy.taxeditor.workbench.part.IE4ViewerPart;
  * @date 24.05.2017
  */
 public class CharacterEditor implements ICharacterEditor, IConversationEnabled, ISelectionChangedListener,
-        ModifyListener, IE4ViewerPart, IPartContentHasDetails, IPartContentHasSupplementalData, 
+        ModifyListener, IE4ViewerPart, IPartContentHasDetails, IPartContentHasSupplementalData,
         IDirtyMarkable, IE4SavablePart {
 
     private FeatureTreeDtoEditorComposite characterTreeEditorComposite;
@@ -245,8 +245,7 @@ public class CharacterEditor implements ICharacterEditor, IConversationEnabled,
                 }
                 Collection<Character> characters = createCharacters((TreeSelection)structureTreeSelection, (TreeSelection)propertyTreeSelection);
                 TermNodeDto parent = characterTreeEditorComposite.getFeatureTree().getRoot();
-                UpdateResult result = null;
-                TermTree tree = null;
+
                 for (Character character : characters) {
                     //add new Character to feature tree
                     CharacterNodeDto nodeDto = new CharacterNodeDto(CharacterDto.fromCharacter(character), parent, 0, parent.getTree(), null, null, null);
@@ -255,9 +254,7 @@ public class CharacterEditor implements ICharacterEditor, IConversationEnabled,
                     //                    result = CdmStore.getService(IFeatureNodeService.class).createChildFeatureNode(parent.getUuid(), character, vocabulary.getUuid());
 
                 }
-                if (tree != null){
-                    characterTreeEditorComposite.setSelectedTree(tree);
-                }
+
 
                 refresh();
             }
@@ -291,7 +288,7 @@ public class CharacterEditor implements ICharacterEditor, IConversationEnabled,
         viewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
         viewer.setContentProvider(new TermTreeContentProvider());
         viewer.setLabelProvider(new TermTreeLabelProvider());
-        viewer.setComparator(new FeatureTreeViewerComparator());
+        viewer.setComparator(new TermTreeViewerComparator());
         viewer.addSelectionChangedListener(this);
         viewer.setInput(CdmStore.getService(ITermTreeService.class).list(termType, null, null, null, TermTreeEditor.TREE_PROPERTY_PATH));
         btnRefresh.addSelectionListener(new SelectionAdapter() {