ref #7439 Fix visual update when converting team <> person

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4.java
index 17c177d2acb70df3dbdfed0424f8fca6a3a7f71b..359a57763a3494c5602a47ff11bd8d21aac3f2cd 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4.java
@@ -64,7 +64,6 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Menu;
 
-import ca.odell.glazedlists.BasicEventList;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
@@ -421,14 +420,14 @@ public class BulkEditorE4 implements IPartContentHasDetails, IConversationEnable
     }
 
     public void refresh() {
-        refresh(true);
+//        refresh(true);
     }
 
     public void refresh(boolean resetInput) {
-        if(resetInput){
+//        if(resetInput){
 //            viewer.setInput(getEditorInput().getModel());
-        }
-//        viewer.refresh();
+//        }
+//        natTable.doCommand(new VisualRefreshCommand());
     }
 
 //    public TableViewer getViewer() {

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/ConvertPerson2TeamHandlerE4.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/ConvertPerson2TeamHandlerE4.java
index 0fdad2d19d2899303a9ea94e20519beb4ccf8d47..8fb53927eac069cec0e618cdea379ca83f3e3eb7 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/ConvertPerson2TeamHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/ConvertPerson2TeamHandlerE4.java
@@ -54,6 +54,8 @@ public class ConvertPerson2TeamHandlerE4 {
             }
         }
 
+
+        Person person = (Person) selection;
         Team team =null;
         UpdateResult result = null;
         try {
@@ -65,9 +67,8 @@ public class ConvertPerson2TeamHandlerE4 {
         }
         if (result != null &&result.isOk()){
             team = (Team)result.getCdmEntity();
-        }
-        if (team != null){
-            editor.refresh();
+            editor.getEditorInput().getModel().remove(person);
+            editor.getEditorInput().getModel().add(team);
         }
     }
 

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/ConvertTeam2PersonHandlerE4.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/ConvertTeam2PersonHandlerE4.java
index 34650cb72d46ee6343cfcdab1cfde7d9835d45ce..964179e7a134a472ffd754e6c7fc695618899a32 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/ConvertTeam2PersonHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/ConvertTeam2PersonHandlerE4.java
@@ -65,12 +65,9 @@ public class ConvertTeam2PersonHandlerE4 {
                }
                if (result != null && result.isOk()){
                    person = (Person)result.getCdmEntity();
-                   boolean test = editor.getEditorInput().getModel().remove(team);
+                   editor.getEditorInput().getModel().remove(team);
                    editor.getEditorInput().getModel().add(person);
                }
-               if (person != null){
-                   editor.refresh();
-               }
     }
 
     @CanExecute