Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
af3
kernel
Commits
78f264ee
Commit
78f264ee
authored
Sep 07, 2018
by
reaboi
Browse files
Revert "3293 deleting a component having a test suite"
This reverts commit
35d7638c
.
parent
35d7638c
Changes
2
Hide whitespace changes
Inline
Side-by-side
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/actions/.ratings
View file @
78f264ee
CopyAction.java cc58c9f52b8d0b8698a9905ffadff7c37976481b GREEN
CopyAction.java cc58c9f52b8d0b8698a9905ffadff7c37976481b GREEN
CutAction.java 6e963d94aeea85676beb38489748002b6d13346a GREEN
CutAction.java 6e963d94aeea85676beb38489748002b6d13346a GREEN
DeleteAction.java
96fd45832167c555b407d7169fc7a3dd03a8fe8d
GREEN
DeleteAction.java
788b5df59525e069365c4f272b39e0892133e9b9
GREEN
PasteAction.java f834f26660a664f138c19d82ace7b17ecc18603f GREEN
PasteAction.java f834f26660a664f138c19d82ace7b17ecc18603f GREEN
RedoAction.java d91086533289a4175e7f5ee949b31a0edc86672a GREEN
RedoAction.java d91086533289a4175e7f5ee949b31a0edc86672a GREEN
RenameAction.java f469d30cab3f692e2e0112c8f89c622ee0fa8db6 GREEN
RenameAction.java f469d30cab3f692e2e0112c8f89c622ee0fa8db6 GREEN
...
...
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/actions/DeleteAction.java
View file @
78f264ee
...
@@ -236,10 +236,6 @@ public class DeleteAction extends EObjectActionBase<EObject> {
...
@@ -236,10 +236,6 @@ public class DeleteAction extends EObjectActionBase<EObject> {
private
static
void
doCompositorBasedDelete
(
List
<
EObject
>
targets
)
{
private
static
void
doCompositorBasedDelete
(
List
<
EObject
>
targets
)
{
// Sort list of deletion targets such that object whose eContainer() is not contained in
// Sort list of deletion targets such that object whose eContainer() is not contained in
// 'targets' are deleted first (e.g., free connectors in hierarchical element models).
// 'targets' are deleted first (e.g., free connectors in hierarchical element models).
List
<
EObject
>
deleteObjects
=
new
ArrayList
<
EObject
>();
List
<
EObject
>
disconnectObjects
=
new
ArrayList
<
EObject
>();
Set
<
EObject
>
targetSet
=
new
HashSet
<
EObject
>();
Set
<
EObject
>
targetSet
=
new
HashSet
<
EObject
>();
targetSet
.
addAll
(
targets
);
targetSet
.
addAll
(
targets
);
...
@@ -264,21 +260,9 @@ public class DeleteAction extends EObjectActionBase<EObject> {
...
@@ -264,21 +260,9 @@ public class DeleteAction extends EObjectActionBase<EObject> {
for
(
EObject
target
:
sortedTargets
)
{
for
(
EObject
target
:
sortedTargets
)
{
if
(
IElementCompositorService
.
getInstance
().
canDecompose
(
target
))
{
if
(
IElementCompositorService
.
getInstance
().
canDecompose
(
target
))
{
deleteObjects
.
add
(
target
);
IElementCompositorService
.
getInstance
().
decompose
(
target
);
}
else
if
(
IConnectionCompositorService
.
getInstance
().
canDisconnect
(
target
))
{
}
else
if
(
IConnectionCompositorService
.
getInstance
().
canDisconnect
(
target
))
{
disconnectObjects
.
add
(
target
);
IConnectionCompositorService
.
getInstance
().
disconnect
(
target
);
}
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
++)
{
IElementCompositorService
.
getInstance
().
decompose
(
disconnectObjects
.
get
(
index
));
}
}
}
}
}
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment