From 12111c31e7c5b3c262c6096f0423a3b4585b9fa2 Mon Sep 17 00:00:00 2001
From: reaboi <reaboi@fortiss.org>
Date: Mon, 10 Sep 2018 10:58:29 +0200
Subject: [PATCH] Revert "3293 deleting a component having a test suite"
This reverts commit f6b0e5b0586f0473a92b86aab2b92a571de99938.
---
.../tooling/kernel/ui/internal/actions/.ratings | 2 +-
.../kernel/ui/internal/actions/DeleteAction.java | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/actions/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/actions/.ratings
index 839c85d9f..a4e3289f1 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/actions/.ratings
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/actions/.ratings
@@ -1,6 +1,6 @@
CopyAction.java cc58c9f52b8d0b8698a9905ffadff7c37976481b GREEN
CutAction.java 6e963d94aeea85676beb38489748002b6d13346a GREEN
-DeleteAction.java 6d6367f171a7692611846bf197c5743950f3d863 GREEN
+DeleteAction.java 96fd45832167c555b407d7169fc7a3dd03a8fe8d GREEN
PasteAction.java f834f26660a664f138c19d82ace7b17ecc18603f GREEN
RedoAction.java d91086533289a4175e7f5ee949b31a0edc86672a GREEN
RenameAction.java f469d30cab3f692e2e0112c8f89c622ee0fa8db6 GREEN
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/actions/DeleteAction.java b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/actions/DeleteAction.java
index 6d6367f17..96fd45832 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/actions/DeleteAction.java
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/actions/DeleteAction.java
@@ -268,17 +268,17 @@ public class DeleteAction extends EObjectActionBase<EObject> {
} else if(IConnectionCompositorService.getInstance().canDisconnect(target)) {
disconnectObjects.add(target);
}
- }
- if(!deleteObjects.isEmpty()) {
- for(int index = 0; index < deleteObjects.size(); index++) {
- IElementCompositorService.getInstance().decompose(deleteObjects.get(index));
+ if(!deleteObjects.isEmpty()) {
+ for(int index = 0; index < deleteObjects.size(); index++) {
+ IElementCompositorService.getInstance().decompose(deleteObjects.get(index));
+ }
}
- }
- if(!disconnectObjects.isEmpty()) {
- for(int index = 0; index < disconnectObjects.size(); index++) {
- IConnectionCompositorService.getInstance().disconnect(disconnectObjects.get(index));
+ if(!disconnectObjects.isEmpty()) {
+ for(int index = 0; index < disconnectObjects.size(); index++) {
+ IElementCompositorService.getInstance().decompose(disconnectObjects.get(index));
+ }
}
}
}
--
GitLab