Sprint task - fix for issue http://bugs.eclipse.org/413054

1 files changed, 4 insertions, 79 deletions

diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/delete/DeleteTreeItemHandlerTSBrowser.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/delete/DeleteTreeItemHandlerTSBrowser.java
index 5c1daa946..64d5f9812 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/delete/DeleteTreeItemHandlerTSBrowser.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/delete/DeleteTreeItemHandlerTSBrowser.java
@@ -14,8 +14,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.collections.ListUtils;
-import org.eclipse.jubula.client.core.businessprocess.db.TestSuiteBP;
-import org.eclipse.jubula.client.core.model.IAUTMainPO;
 import org.eclipse.jubula.client.core.model.ICategoryPO;
 import org.eclipse.jubula.client.core.model.INodePO;
 import org.eclipse.jubula.client.core.model.IRefTestSuitePO;
@@ -25,13 +23,8 @@ import org.eclipse.jubula.client.core.persistence.MultipleNodePM.AbstractCmdHand
 import org.eclipse.jubula.client.core.persistence.MultipleNodePM.DeleteCatHandle;
 import org.eclipse.jubula.client.core.persistence.MultipleNodePM.DeleteExecHandle;
 import org.eclipse.jubula.client.core.persistence.NodePM;
-import org.eclipse.jubula.client.ui.rcp.Plugin;
-import org.eclipse.jubula.client.ui.rcp.editors.ObjectMappingMultiPageEditor;
-import org.eclipse.jubula.client.ui.rcp.editors.TestJobEditor;
-import org.eclipse.jubula.client.ui.rcp.editors.TestSuiteEditor;
 import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil;
 import org.eclipse.jubula.tools.messagehandling.MessageIDs;
-import org.eclipse.ui.IEditorReference;
 
 /**
  * @author BREDEX GmbH
@@ -47,8 +40,6 @@ public class DeleteTreeItemHandlerTSBrowser extends
      */
     protected List<AbstractCmdHandle> getDeleteCommands(
             List<INodePO> nodesToDelete) {
-        IEditorReference[] editors = Plugin.getActivePage()
-                .getEditorReferences();
         List<AbstractCmdHandle> cmds = new ArrayList<AbstractCmdHandle>(
                 nodesToDelete.size());
         for (INodePO node : nodesToDelete) {
@@ -58,16 +49,15 @@ public class DeleteTreeItemHandlerTSBrowser extends
                 List<IRefTestSuitePO> refTs = NodePM.getInternalRefTestSuites(
                         testSuite.getGuid(), testSuite.getParentProjectId());
                 if (refTs.size() > 0) {
-                    ErrorHandlingUtil
-                            .createMessageDialog(MessageIDs.I_REUSED_TS);
+                    ErrorHandlingUtil.createMessageDialog(
+                            MessageIDs.I_REUSED_TS);
                     return ListUtils.EMPTY_LIST;
                 }
-
-                closeEditors(testSuite, editors);
+                closeOpenEditor(testSuite);
                 cmd = new DeleteExecHandle(testSuite);
             } else if (node instanceof ITestJobPO) {
                 ITestJobPO testjob = (ITestJobPO) node;
-                closeEditors(testjob, editors);
+                closeOpenEditor(testjob);
                 cmd = new DeleteExecHandle(testjob);
             } else if (node instanceof ICategoryPO) {
                 ICategoryPO category = (ICategoryPO) node;
@@ -77,69 +67,4 @@ public class DeleteTreeItemHandlerTSBrowser extends
         }
         return cmds;
     }
-
-    /**
-     * Closes all given IEditorReferences
-     * 
-     * @param testjob
-     *            the Test Job
-     * @param editors
-     *            the IEditorReferences
-     */
-    private void closeEditors(ITestJobPO testjob, IEditorReference[] editors) {
-        for (IEditorReference editor : editors) {
-            if (editor.getPart(true) instanceof TestJobEditor) {
-                TestJobEditor tjEditor = (TestJobEditor) editor.getPart(true);
-                if (tjEditor.getEditorInput().getName()
-                        .endsWith(testjob.getName())) {
-                    tjEditor.getEditorSite().getPage()
-                            .closeEditor(tjEditor, true);
-                }
-            }
-        }
-    }
-
-    /**
-     * Closes all given IEditorReferences
-     * 
-     * @param execTS
-     *            the TestSuite
-     * @param editors
-     *            the IEditorReferences
-     */
-    private void closeEditors(ITestSuitePO execTS, IEditorReference[] editors) {
-        for (IEditorReference editor : editors) {
-            if (editor.getPart(true) instanceof TestSuiteEditor) {
-                TestSuiteEditor tsEditor = (TestSuiteEditor) editor
-                        .getPart(true);
-                if (tsEditor.getEditorInput().getName()
-                        .endsWith(execTS.getName())) {
-
-                    tsEditor.getEditorSite().getPage()
-                            .closeEditor(tsEditor, true);
-                }
-            }
-            if (editor.getPart(true) instanceof ObjectMappingMultiPageEditor) {
-                int autCounter = 0;
-                ObjectMappingMultiPageEditor omEditor = 
-                        (ObjectMappingMultiPageEditor) editor
-                            .getPart(true);
-                IAUTMainPO omAut = omEditor.getAut();
-                List<ITestSuitePO> tsList = TestSuiteBP.getListOfTestSuites();
-                for (ITestSuitePO ts : tsList) {
-                    if (ts.getAut() != null && ts.getAut().equals(omAut)) {
-                        autCounter++;
-                    }
-                }
-                if (execTS.getAut() != null && execTS.getAut().equals(omAut)) {
-                    autCounter--;
-                }
-                if (autCounter == 0) {
-                    omEditor.getEditorSite().getPage()
-                            .closeEditor(omEditor, true);
-                }
-            }
-        }
-    }
-
 }