From 1d1ac03d974e44533813e00d3d1039c80ef89927 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Fri, 15 Nov 2019 10:32:07 +0100 Subject: [PATCH] regenerated with latest xbase.lib Signed-off-by: Christian Dietrich --- .../org/eclipse/xtext/ide/server/SocketServerLauncher.java | 7 +++---- .../xtext/generator/formatting/Formatter2Fragment2.java | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/SocketServerLauncher.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/SocketServerLauncher.java index 57644c76d..b1c89eecf 100644 --- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/SocketServerLauncher.java +++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/SocketServerLauncher.java @@ -18,14 +18,13 @@ import java.net.SocketAddress; import java.nio.channels.AsynchronousServerSocketChannel; import java.nio.channels.AsynchronousSocketChannel; import java.nio.channels.Channels; -import java.util.List; import org.apache.log4j.Logger; import org.eclipse.lsp4j.jsonrpc.Launcher; import org.eclipse.lsp4j.services.LanguageClient; import org.eclipse.xtext.ide.server.LanguageServerImpl; import org.eclipse.xtext.ide.server.ServerModule; import org.eclipse.xtext.util.internal.Log; -import org.eclipse.xtext.xbase.lib.Conversions; +import org.eclipse.xtext.xbase.lib.ArrayExtensions; import org.eclipse.xtext.xbase.lib.Exceptions; /** @@ -95,7 +94,7 @@ public class SocketServerLauncher { protected PrintWriter getTrace(final String... args) { PrintWriter _xifexpression = null; - boolean _contains = ((List)Conversions.doWrapArray(args)).contains(SocketServerLauncher.TRACE); + boolean _contains = ArrayExtensions.contains(args, SocketServerLauncher.TRACE); if (_contains) { _xifexpression = new PrintWriter(System.out); } @@ -103,7 +102,7 @@ public class SocketServerLauncher { } protected boolean shouldValidate(final String... args) { - boolean _contains = ((List)Conversions.doWrapArray(args)).contains(SocketServerLauncher.NO_VALIDATE); + boolean _contains = ArrayExtensions.contains(args, SocketServerLauncher.NO_VALIDATE); return (!_contains); } diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/formatting/Formatter2Fragment2.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/formatting/Formatter2Fragment2.java index 30b333af8..87e7a6c0a 100644 --- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/formatting/Formatter2Fragment2.java +++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/formatting/Formatter2Fragment2.java @@ -32,8 +32,8 @@ import org.eclipse.xtext.formatting2.IFormattableDocument; import org.eclipse.xtext.formatting2.IFormatter2; import org.eclipse.xtext.preferences.IPreferenceValuesProvider; import org.eclipse.xtext.util.internal.Log; +import org.eclipse.xtext.xbase.lib.ArrayExtensions; import org.eclipse.xtext.xbase.lib.CollectionLiterals; -import org.eclipse.xtext.xbase.lib.Conversions; import org.eclipse.xtext.xbase.lib.Extension; import org.eclipse.xtext.xbase.lib.Functions.Function1; import org.eclipse.xtext.xbase.lib.IterableExtensions; @@ -318,7 +318,7 @@ public class Formatter2Fragment2 extends AbstractStubGeneratingFragment { if (_contains) { name = ("_" + name); } - boolean _contains_1 = ((List)Conversions.doWrapArray(reservedNames)).contains(name); + boolean _contains_1 = ArrayExtensions.contains(reservedNames, name); if (_contains_1) { name = ("_" + name); }