From c2c021b55994b11b5c88852233e99a722df6725c Mon Sep 17 00:00:00 2001
From: Simon Barner <barner@fortiss.org>
Date: Tue, 2 Oct 2018 15:39:08 +0200
Subject: [PATCH] Avoid warning about unlikely argument
* container.getContainedElements() is of type List<IHierarchicElement>
* The (unchecked) cast of elementRef -> IHierarchicElement has already
been present in the previous version of this method
Issue-Ref: 3539
Issue-Url: https://af3-developer.fortiss.org/issues/3539
Signed-off-by: Simon Barner <barner@fortiss.org>
---
.../src/org/fortiss/tooling/base/library/.ratings | 2 +-
.../tooling/base/library/ModelElementLibraryService.java | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/org.fortiss.tooling.base/src/org/fortiss/tooling/base/library/.ratings b/org.fortiss.tooling.base/src/org/fortiss/tooling/base/library/.ratings
index a116954b5..8e360111c 100644
--- a/org.fortiss.tooling.base/src/org/fortiss/tooling/base/library/.ratings
+++ b/org.fortiss.tooling.base/src/org/fortiss/tooling/base/library/.ratings
@@ -1 +1 @@
-ModelElementLibraryService.java ad618d79106b45f9b63856023a1df1ab65f2cec7 GREEN
+ModelElementLibraryService.java aae1cda83bd706a5798169daa4a64db5be0a0588 YELLOW
diff --git a/org.fortiss.tooling.base/src/org/fortiss/tooling/base/library/ModelElementLibraryService.java b/org.fortiss.tooling.base/src/org/fortiss/tooling/base/library/ModelElementLibraryService.java
index ad618d791..aae1cda83 100644
--- a/org.fortiss.tooling.base/src/org/fortiss/tooling/base/library/ModelElementLibraryService.java
+++ b/org.fortiss.tooling.base/src/org/fortiss/tooling/base/library/ModelElementLibraryService.java
@@ -141,7 +141,8 @@ public class ModelElementLibraryService implements ILibraryService {
final ILibraryElementReference elementRef) {
IHierarchicElement wrapped = (IHierarchicElement)elementRef.getLibraryElementShadow();
IHierarchicElement container = (IHierarchicElement)elementRef.eContainer();
- container.getContainedElements().remove(elementRef);
+ IHierarchicElement elementRefHierarchicElement = (IHierarchicElement)elementRef;
+ container.getContainedElements().remove(elementRefHierarchicElement);
// preserve the ID of the reference
((IIdLabeled)wrapped).setId(((IIdLabeled)elementRef).getId());
@@ -151,7 +152,7 @@ public class ModelElementLibraryService implements ILibraryService {
wrappedConnectorsList.addAll(wrapped.getConnectors());
wrapped.getConnectors().clear();
EList<IConnector> elementRefConnectorsList = new BasicEList<IConnector>();
- elementRefConnectorsList.addAll(((IHierarchicElement)elementRef).getConnectors());
+ elementRefConnectorsList.addAll(elementRefHierarchicElement.getConnectors());
for(IConnector elemRefConnector : elementRefConnectorsList) {
wrapped.getConnectors().add(elemRefConnector);
String elementRefConnectorName = ((INamedElement)elemRefConnector).getName();
--
GitLab