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
ea1428e3
Commit
ea1428e3
authored
Sep 07, 2018
by
reaboi
Browse files
3293 deleting a component having a test suite
GREEN To test Signed-off-by:
reaboi
<
reaboi@fortiss.org
>
parent
78f264ee
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 @
ea1428e3
CopyAction.java cc58c9f52b8d0b8698a9905ffadff7c37976481b GREEN
CutAction.java 6e963d94aeea85676beb38489748002b6d13346a GREEN
DeleteAction.java
788b5df59525e069365c4f272b39e0892133e9b9
GREEN
DeleteAction.java
96fd45832167c555b407d7169fc7a3dd03a8fe8d
GREEN
PasteAction.java f834f26660a664f138c19d82ace7b17ecc18603f GREEN
RedoAction.java d91086533289a4175e7f5ee949b31a0edc86672a GREEN
RenameAction.java f469d30cab3f692e2e0112c8f89c622ee0fa8db6 GREEN
...
...
org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/actions/DeleteAction.java
View file @
ea1428e3
...
...
@@ -236,6 +236,10 @@ public class DeleteAction extends EObjectActionBase<EObject> {
private
static
void
doCompositorBasedDelete
(
List
<
EObject
>
targets
)
{
// 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).
List
<
EObject
>
deleteObjects
=
new
ArrayList
<
EObject
>();
List
<
EObject
>
disconnectObjects
=
new
ArrayList
<
EObject
>();
Set
<
EObject
>
targetSet
=
new
HashSet
<
EObject
>();
targetSet
.
addAll
(
targets
);
...
...
@@ -260,9 +264,21 @@ public class DeleteAction extends EObjectActionBase<EObject> {
for
(
EObject
target
:
sortedTargets
)
{
if
(
IElementCompositorService
.
getInstance
().
canDecompose
(
target
))
{
IElementCompositorService
.
getInstance
().
decompose
(
target
);
deleteObjects
.
add
(
target
);
}
else
if
(
IConnectionCompositorService
.
getInstance
().
canDisconnect
(
target
))
{
IConnectionCompositorService
.
getInstance
().
disconnect
(
target
);
disconnectObjects
.
add
(
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