From 280cb4c82059bdcbe4f0f3ab2bbfbb71149b76c9 Mon Sep 17 00:00:00 2001 From: Sven Efftinge Date: Mon, 21 Nov 2011 10:05:55 +0100 Subject: [PATCH] [xtext] removed/replaced all guice 3 incompatible dependencies --- .../util/formallang/FollowerFunctionImpl.java | 2 +- .../util/formallang/NfaGraphFormatter.java | 4 +- .../xtext/util/formallang/PdaUtil.java | 4 +- .../formallang/ProductionStringFactory.java | 12 +-- .../xtext/util/formallang/ProductionUtil.java | 2 +- .../xtext/util/formallang/StringCfg.java | 4 +- .../util/formallang/StringProduction.java | 2 +- .../util/internal/FormattingMigrator.java | 2 +- .../GenericResourceServiceProvider.java | 5 +- .../SyntacticSequencerDiagnosticProvider.java | 4 +- .../DefaultResourceDescriptionDeltaTest.java | 2 +- .../serializer/ContextPDAProviderTest.java | 4 +- .../xtext/serializer/ContextProviderTest.java | 6 +- .../ContextTypePDAProviderTest.java | 7 +- ...rConstraintProviderAssignedActionTest.java | 74 +++++++++---------- ...cticSequencerPDAProviderNavigatorTest.java | 1 - .../SyntacticSequencerPDAProviderTest.java | 4 +- 17 files changed, 66 insertions(+), 73 deletions(-) diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/FollowerFunctionImpl.java b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/FollowerFunctionImpl.java index 9790678bf..241fb0cc2 100644 --- a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/FollowerFunctionImpl.java +++ b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/FollowerFunctionImpl.java @@ -13,8 +13,8 @@ import java.util.Set; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.google.inject.internal.Lists; /** * @author Moritz Eysholdt - Initial contribution and API diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaGraphFormatter.java b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaGraphFormatter.java index 3b3ce24fe..d6eba2834 100644 --- a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaGraphFormatter.java +++ b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaGraphFormatter.java @@ -13,8 +13,8 @@ import java.util.Map; import org.eclipse.xtext.util.Wrapper; import com.google.common.base.Joiner; -import com.google.inject.internal.Lists; -import com.google.inject.internal.Maps; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; /** * @author Moritz Eysholdt - Initial contribution and API diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/PdaUtil.java b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/PdaUtil.java index de7013d39..eaad1bcda 100644 --- a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/PdaUtil.java +++ b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/PdaUtil.java @@ -19,6 +19,7 @@ import org.eclipse.xtext.util.formallang.NfaUtil.MappedComparator; import com.google.common.base.Function; import com.google.common.base.Functions; +import com.google.common.base.Joiner; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.LinkedHashMultimap; @@ -27,7 +28,6 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; import com.google.inject.Inject; -import com.google.inject.internal.Join; /** * @author Moritz Eysholdt - Initial contribution and API @@ -137,7 +137,7 @@ public class PdaUtil { result.add(current.value.toString()); current = current.pop(); } - return Join.join(", ", result); + return Joiner.on(", ").join(result); } } diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionStringFactory.java b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionStringFactory.java index d9fe07040..9fbfee7be 100644 --- a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionStringFactory.java +++ b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionStringFactory.java @@ -11,10 +11,10 @@ import java.util.Collections; import java.util.List; import com.google.common.base.Function; +import com.google.common.base.Joiner; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; -import com.google.inject.internal.Join; -import com.google.inject.internal.Lists; +import com.google.common.collect.Lists; /** * @author Moritz Eysholdt - Initial contribution and API @@ -38,14 +38,14 @@ public class ProductionStringFactory implements ProductionFactory children) { List childrenSorted = Lists.newArrayList(Iterables.filter(children, Predicates.notNull())); Collections.sort(childrenSorted); - return "(" + Join.join(" | ", childrenSorted) + ")" + card(many, optional); + return "(" + Joiner.on(" | ").join(childrenSorted) + ")" + card(many, optional); } public String createForSequentialChildren(boolean many, boolean optional, Iterable children) { children = Iterables.filter(children, Predicates.notNull()); if (many || optional) - return "(" + Join.join(" ", children) + ")" + card(many, optional); - return Join.join(" ", children) + card(many, optional); + return "(" + Joiner.on(" ").join(children) + ")" + card(many, optional); + return Joiner.on(" ").join(children) + card(many, optional); } public String createForToken(boolean many, boolean optional, TOKEN token) { @@ -59,7 +59,7 @@ public class ProductionStringFactory implements ProductionFactory children) { List childrenSorted = Lists.newArrayList(Iterables.filter(children, Predicates.notNull())); Collections.sort(childrenSorted); - return "(" + Join.join(" & ", childrenSorted) + ")" + card(many, optional); + return "(" + Joiner.on(" & ").join(childrenSorted) + ")" + card(many, optional); } } diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionUtil.java b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionUtil.java index 7df0e3a2a..e052a458d 100644 --- a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionUtil.java +++ b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionUtil.java @@ -11,7 +11,7 @@ import java.util.List; import com.google.common.base.Predicate; import com.google.common.base.Predicates; -import com.google.inject.internal.Lists; +import com.google.common.collect.Lists; /** * @author Moritz Eysholdt - Initial contribution and API diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringCfg.java b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringCfg.java index 2809bc55e..6135c456e 100644 --- a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringCfg.java +++ b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringCfg.java @@ -16,8 +16,8 @@ import org.eclipse.xtext.util.Pair; import org.eclipse.xtext.util.formallang.StringProduction.ProdElement; import com.google.common.base.Joiner; -import com.google.inject.internal.Lists; -import com.google.inject.internal.Maps; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; /** * @author Moritz Eysholdt - Initial contribution and API diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringProduction.java b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringProduction.java index 3157f8840..6b9d4cd4d 100644 --- a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringProduction.java +++ b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringProduction.java @@ -18,7 +18,7 @@ import org.eclipse.xtext.util.Pair; import org.eclipse.xtext.util.Tuples; import org.eclipse.xtext.util.formallang.StringProduction.ProdElement; -import com.google.inject.internal.Lists; +import com.google.common.collect.Lists; /** * @author Moritz Eysholdt - Initial contribution and API diff --git a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/FormattingMigrator.java b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/FormattingMigrator.java index ba3b1f2be..3a1985fe2 100644 --- a/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/FormattingMigrator.java +++ b/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/FormattingMigrator.java @@ -13,7 +13,7 @@ import java.util.regex.Pattern; import org.eclipse.xtext.util.Strings; -import com.google.inject.internal.Lists; +import com.google.common.collect.Lists; /** * @author Moritz Eysholdt - Initial contribution and API diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/GenericResourceServiceProvider.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/GenericResourceServiceProvider.java index 37e7cbe69..b721703ed 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/GenericResourceServiceProvider.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/GenericResourceServiceProvider.java @@ -16,7 +16,6 @@ import org.eclipse.xtext.resource.IResourceServiceProvider; import org.eclipse.xtext.validation.IResourceValidator; import com.google.inject.Inject; -import com.google.inject.internal.Nullable; /** * An {@link IResourceServiceProvider} for non-Xtext resources. @@ -27,7 +26,7 @@ import com.google.inject.internal.Nullable; public class GenericResourceServiceProvider implements IResourceServiceProvider { @Inject - @Nullable +// @Nullable private IContainer.Manager containerManager; public IContainer.Manager getContainerManager() { @@ -42,7 +41,7 @@ public class GenericResourceServiceProvider implements IResourceServiceProvider } @Inject - @Nullable +// @Nullable private IResourceValidator resourceValidator = IResourceValidator.NULL; public IResourceValidator getResourceValidator() { diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/SyntacticSequencerDiagnosticProvider.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/SyntacticSequencerDiagnosticProvider.java index f1dde3251..8592665b4 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/SyntacticSequencerDiagnosticProvider.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/SyntacticSequencerDiagnosticProvider.java @@ -19,8 +19,8 @@ import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISyn import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynTransition; import org.eclipse.xtext.serializer.sequencer.RuleCallStack; +import com.google.common.base.Joiner; import com.google.common.collect.Lists; -import com.google.inject.internal.Join; /** * @author Moritz Eysholdt - Initial contribution and API @@ -39,7 +39,7 @@ public class SyntacticSequencerDiagnosticProvider implements ISyntacticSequencer StringBuilder msg = new StringBuilder(); msg.append("State '" + toName + "' may not follow '" + fromName + "'.\n"); - msg.append("Valid followers are: " + Join.join(", ", targets)); + msg.append("Valid followers are: " + Joiner.on(", ").join(targets)); return new SerializationDiagnostic(INVALID_FOLLOWING_ABSORBER, semanticObject, context, msg.toString()); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionDeltaTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionDeltaTest.java index 4e128b882..8a5cb3460 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionDeltaTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionDeltaTest.java @@ -24,8 +24,8 @@ import org.eclipse.xtext.resource.IEObjectDescription; import org.eclipse.xtext.resource.IReferenceDescription; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.google.inject.internal.Maps; /** * @author Sven Efftinge - Initial contribution and API diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextPDAProviderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextPDAProviderTest.java index b33174cef..24877dd3e 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextPDAProviderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextPDAProviderTest.java @@ -28,8 +28,8 @@ import org.eclipse.xtext.util.formallang.Pda; import org.eclipse.xtext.util.formallang.PdaListFormatter; import com.google.common.base.Function; +import com.google.common.base.Joiner; import com.google.common.collect.Lists; -import com.google.inject.internal.Join; /** * @author Moritz Eysholdt - Initial contribution and API @@ -80,7 +80,7 @@ public class ContextPDAProviderTest extends AbstractXtextTests { Pda pda = get(IContextPDAProvider.class).getContextPDA(ctx.getFirst()); result.add(" " + formatter.format(pda).replace("\n", "\n ")); } - return Join.join("\n", result); + return Joiner.on("\n").join(result); } @Override diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextProviderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextProviderTest.java index 3d6e83c88..9ee3abf11 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextProviderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextProviderTest.java @@ -22,9 +22,9 @@ import org.eclipse.xtext.util.Pair; import org.eclipse.xtext.util.Tuples; import com.google.common.base.Function; +import com.google.common.base.Joiner; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import com.google.inject.internal.Join; /** * @author Moritz Eysholdt - Initial contribution and API @@ -57,9 +57,9 @@ public class ContextProviderTest extends AbstractXtextTests { return o1.getFirst().compareTo(o2.getFirst()); } }); - return Join.join("\n", Iterables.transform(result, new Function>, String>() { + return Joiner.on("\n").join(Iterables.transform(result, new Function>, String>() { public String apply(Pair> from) { - return from.getFirst() + " returns " + Join.join(", ", from.getSecond()); + return from.getFirst() + " returns " + Joiner.on(", ").join(from.getSecond()); } })); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextTypePDAProviderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextTypePDAProviderTest.java index 0c82fb016..21a7475fb 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextTypePDAProviderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextTypePDAProviderTest.java @@ -21,16 +21,16 @@ import org.eclipse.xtext.grammaranalysis.impl.GrammarElementTitleSwitch; import org.eclipse.xtext.junit.AbstractXtextTests; import org.eclipse.xtext.serializer.analysis.Context2NameFunction; import org.eclipse.xtext.serializer.analysis.IContextProvider; -import org.eclipse.xtext.serializer.analysis.ISerState; import org.eclipse.xtext.serializer.analysis.IContextTypePDAProvider; +import org.eclipse.xtext.serializer.analysis.ISerState; import org.eclipse.xtext.util.Triple; import org.eclipse.xtext.util.Tuples; import org.eclipse.xtext.util.formallang.Pda; import org.eclipse.xtext.util.formallang.PdaListFormatter; import com.google.common.base.Function; +import com.google.common.base.Joiner; import com.google.common.collect.Lists; -import com.google.inject.internal.Join; /** * @author Moritz Eysholdt - Initial contribution and API @@ -76,6 +76,7 @@ public class ContextTypePDAProviderTest extends AbstractXtextTests { return result; } + @SuppressWarnings("unchecked") protected String getParserRule(String body) throws Exception { Grammar grammar = (Grammar) getModel(HEADER + body); // drawGrammar("pdf/" + getName(), grammar); @@ -93,7 +94,7 @@ public class ContextTypePDAProviderTest extends AbstractXtextTests { ctx.getSecond(), ctx.getFirst()); result.add(" " + formatter.format((Pda) pda).replace("\n", "\n ")); } - return Join.join("\n", result); + return Joiner.on("\n").join(result); } @Override diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderAssignedActionTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderAssignedActionTest.java index 4a372742e..cfdcbf14c 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderAssignedActionTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderAssignedActionTest.java @@ -7,21 +7,14 @@ *******************************************************************************/ package org.eclipse.xtext.serializer; -import java.io.IOException; import java.util.List; import java.util.Set; import org.apache.log4j.Logger; -import org.eclipse.xtext.AbstractElement; import org.eclipse.xtext.Grammar; -import org.eclipse.xtext.GrammarToDot; import org.eclipse.xtext.XtextStandaloneSetup; -import org.eclipse.xtext.grammaranalysis.IGrammarNFAProvider; import org.eclipse.xtext.junit.AbstractXtextTests; -import org.eclipse.xtext.serializer.analysis.ActionFilterNFAProvider; import org.eclipse.xtext.serializer.analysis.IGrammarConstraintProvider; -import org.eclipse.xtext.serializer.analysis.ActionFilterNFAProvider.ActionFilterState; -import org.eclipse.xtext.serializer.analysis.ActionFilterNFAProvider.ActionFilterTransition; import org.eclipse.xtext.serializer.analysis.IGrammarConstraintProvider.IConstraint; import org.eclipse.xtext.serializer.analysis.IGrammarConstraintProvider.IConstraintContext; @@ -34,41 +27,42 @@ import com.google.common.collect.Sets; */ public class GrammarConstraintProviderAssignedActionTest extends AbstractXtextTests { + @SuppressWarnings("unused") private static final Logger log = Logger.getLogger(GrammarConstraintProviderAssignedActionTest.class); - private static class ActionFilter2Dot extends GrammarToDot { - protected IGrammarNFAProvider nfaProvider = new ActionFilterNFAProvider(); - - @Override - protected Node drawAbstractElementTree(AbstractElement ele, Digraph d) { - Node n = super.drawAbstractElementTree(ele, d); - ActionFilterState nfas = nfaProvider.getNFA(ele); - - for (ActionFilterTransition t : nfas.getOutgoing()) - d.add(drawFollowerEdge(ele, t, false)); - for (ActionFilterTransition t : nfas.getOutgoingAfterReturn()) - d.add(drawFollowerEdge(ele, t, true)); - - if (nfas.getOutgoing().size() == 0 && nfas.getOutgoingAfterReturn().size() == 0 && !nfas.isEndState()) - n.setStyle("dotted"); - if (nfas.isEndState()) - n.put("peripheries", "2"); - return n; - } - - protected Edge drawFollowerEdge(AbstractElement ele, ActionFilterTransition t, boolean isParent) { - Edge e = new Edge(ele, t.getTarget().getGrammarElement()); - e.setLabel(String.valueOf(t.getPrecedence())); - e.setStyle("dotted"); - if (isParent) - e.put("arrowtail", "odot"); - if (t.isRuleCall()) - e.put("arrowhead", "onormalonormal"); - else - e.put("arrowhead", "onormal"); - return e; - } - } +// private static class ActionFilter2Dot extends GrammarToDot { +// protected IGrammarNFAProvider nfaProvider = new ActionFilterNFAProvider(); +// +// @Override +// protected Node drawAbstractElementTree(AbstractElement ele, Digraph d) { +// Node n = super.drawAbstractElementTree(ele, d); +// ActionFilterState nfas = nfaProvider.getNFA(ele); +// +// for (ActionFilterTransition t : nfas.getOutgoing()) +// d.add(drawFollowerEdge(ele, t, false)); +// for (ActionFilterTransition t : nfas.getOutgoingAfterReturn()) +// d.add(drawFollowerEdge(ele, t, true)); +// +// if (nfas.getOutgoing().size() == 0 && nfas.getOutgoingAfterReturn().size() == 0 && !nfas.isEndState()) +// n.setStyle("dotted"); +// if (nfas.isEndState()) +// n.put("peripheries", "2"); +// return n; +// } +// +// protected Edge drawFollowerEdge(AbstractElement ele, ActionFilterTransition t, boolean isParent) { +// Edge e = new Edge(ele, t.getTarget().getGrammarElement()); +// e.setLabel(String.valueOf(t.getPrecedence())); +// e.setStyle("dotted"); +// if (isParent) +// e.put("arrowtail", "odot"); +// if (t.isRuleCall()) +// e.put("arrowhead", "onormalonormal"); +// else +// e.put("arrowhead", "onormal"); +// return e; +// } +// } @Override protected void setUp() throws Exception { diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderNavigatorTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderNavigatorTest.java index e09411d46..5220f0c45 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderNavigatorTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderNavigatorTest.java @@ -22,7 +22,6 @@ import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISyn import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynFollowerOwner; import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynState; import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynTransition; -import org.eclipse.xtext.serializer.analysis.SyntacticSequencerPDAProvider; import org.eclipse.xtext.serializer.sequencer.RuleCallStack; import com.google.common.collect.Sets; diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderTest.java index 2675b7774..04ba72b21 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderTest.java @@ -35,9 +35,9 @@ import org.eclipse.xtext.util.formallang.ProductionStringFactory; import org.eclipse.xtext.xbase.lib.Pair; import com.google.common.base.Function; +import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.google.inject.internal.Join; /** * @author Moritz Eysholdt - Initial contribution and API @@ -111,7 +111,7 @@ public class SyntacticSequencerPDAProviderTest extends AbstractXtextTests { result.add(t + "_" + ctx.getThird() + ":"); result.addAll(pda2lines2(get(ISyntacticSequencerPDAProvider.class).getPDA(ctx.getSecond(), ctx.getFirst()))); } - return Join.join("\n", result); + return Joiner.on("\n").join(result); } private String pathToStr2(ISynTransition state) {