Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Redor2015-11-16 10:04:45 +0000
committerLaurent Redor2015-11-16 10:04:45 +0000
commit1365e37bdb3d4688cebab8db40022d51d1de0d6c (patch)
tree40320b74592ca215584a2f1e844b4d61fc81cac3
parent339b540374316ed60447855fb06c16fa3fffcb31 (diff)
downloadorg.eclipse.sirius-1365e37bdb3d4688cebab8db40022d51d1de0d6c.tar.gz
org.eclipse.sirius-1365e37bdb3d4688cebab8db40022d51d1de0d6c.tar.xz
org.eclipse.sirius-1365e37bdb3d4688cebab8db40022d51d1de0d6c.zip
[478802] Replace instanceof BasicEList by InternalEList
The InternalEList is a more common class (compatible with CDO native code for example). Bug: 478802 Change-Id: Ib78aa15e1cc10ef289c7e5df305b591a981fb46e Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RefreshWithCustomizedStyleTests.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RefreshWithCustomizedStyleTests.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RefreshWithCustomizedStyleTests.java
index bb147dd8ef..8236fc1ece 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RefreshWithCustomizedStyleTests.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RefreshWithCustomizedStyleTests.java
@@ -15,10 +15,10 @@ import java.util.Collection;
import java.util.List;
import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
@@ -487,9 +487,9 @@ public class RefreshWithCustomizedStyleTests extends AbstractRefreshWithCustomiz
for (String customizableFeatureName : customizableFeatureNames) {
EStructuralFeature feature = viewpointStyle.eClass().getEStructuralFeature(customizableFeatureName);
Object initialValue = viewpointStyle.eGet(feature);
- if (initialValue instanceof BasicEList<?>) {
- // Clone the list to avoid a change of it during customization.
- initialValue = ((BasicEList<?>) initialValue).clone();
+ if (initialValue instanceof InternalEList<?>) {
+ // Copy the list to avoid a change of it during customization.
+ initialValue = new ArrayList(((InternalEList<?>) initialValue).basicList());
}
if (customizeSiriusStylePropertyFromStyleTab(swtBotGefEditPart, viewpointStyle, feature)) {
Object newValue = viewpointStyle.eGet(feature);

Back to the top