From 65d3718858c7d96db7d11632225777a90e766e70 Mon Sep 17 00:00:00 2001 From: Pierre-Charles David Date: Mon, 22 May 2017 14:40:46 +0200 Subject: [517060] Fix regression in XtextSavingPolicy Commit b57cf3a40deb5d33 was made a little too fast and caused a regression. Use simpler and more transparent code to filter out TypeResources. Bug: 517060 Change-Id: I947e00c7605e91c00e31a56b0aa6b6aa57647b9e Signed-off-by: Pierre-Charles David --- .../sirius/common/xtext/internal/XtextSavingPolicy.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/plugins/org.eclipse.sirius.common.xtext/src/org/eclipse/sirius/common/xtext/internal/XtextSavingPolicy.java b/plugins/org.eclipse.sirius.common.xtext/src/org/eclipse/sirius/common/xtext/internal/XtextSavingPolicy.java index a36c4c8922..8ab90c7b96 100644 --- a/plugins/org.eclipse.sirius.common.xtext/src/org/eclipse/sirius/common/xtext/internal/XtextSavingPolicy.java +++ b/plugins/org.eclipse.sirius.common.xtext/src/org/eclipse/sirius/common/xtext/internal/XtextSavingPolicy.java @@ -10,9 +10,11 @@ *******************************************************************************/ package org.eclipse.sirius.common.xtext.internal; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Map; +import java.util.function.Predicate; import java.util.stream.Stream; import java.util.stream.StreamSupport; @@ -56,8 +58,14 @@ public class XtextSavingPolicy implements SavingPolicy { newOptions.putAll(options); } newOptions.putAll(SaveOptions.newBuilder().noValidation().getOptions().toOptionsMap()); - Stream writeableResourcesToSave = StreamSupport.stream(resourcesToSave.spliterator(), false).filter(k -> ! (k instanceof TypeResource)); - return delegate.save(() -> writeableResourcesToSave.iterator(), newOptions, monitor); + + Collection writeableResourcesToSave = new ArrayList<>(); + resourcesToSave.forEach(r -> { + if (!(r instanceof TypeResource)) { + writeableResourcesToSave.add(r); + } + }); + return delegate.save(writeableResourcesToSave, newOptions, monitor); } } -- cgit v1.2.3