sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 08:48:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[xtext] removed/replaced all guice 3 incompatible dependencies

Browse source
This commit is contained in:
Sven Efftinge 2011-11-21 10:05:55 +01:00
parent e4f327c00b
commit 280cb4c820
17 changed files with 66 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/FollowerFunctionImpl.java
View file

@ -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

4
plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/NfaGraphFormatter.java
View file

@ -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

4
plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/PdaUtil.java
View file

@ -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);
}
}

12
plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionStringFactory.java
View file

@ -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<TOKEN> implements ProductionFactory<String,
public String createForAlternativeChildren(boolean many, boolean optional, Iterable<String> children) {
List<String> 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<String> 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<TOKEN> implements ProductionFactory<String,
public String createForUnordertedChildren(boolean many, boolean optional, Iterable<String> children) {
List<String> 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);
}
}

2
plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/ProductionUtil.java
View file

@ -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

4
plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringCfg.java
View file

@ -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

2
plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/formallang/StringProduction.java
View file

@ -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

2
plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/FormattingMigrator.java
View file

@ -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

5
plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/generic/GenericResourceServiceProvider.java
View file

@ -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() {

4
plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/SyntacticSequencerDiagnosticProvider.java
View file

@ -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());
}

2
tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/resource/impl/DefaultResourceDescriptionDeltaTest.java
View file

@ -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

4
tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextPDAProviderTest.java
View file

@ -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<ISerState, RuleCall> 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

6
tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextProviderTest.java
View file

@ -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<Pair<String, List<String>>, String>() {
return Joiner.on("\n").join(Iterables.transform(result, new Function<Pair<String, List<String>>, String>() {
public String apply(Pair<String, List<String>> from) {
return from.getFirst() + " returns " + Join.join(", ", from.getSecond());
return from.getFirst() + " returns " + Joiner.on(", ").join(from.getSecond());
}
}));
}

7
tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/ContextTypePDAProviderTest.java
View file

@ -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<ISerState, RuleCall>) pda).replace("\n", "\n "));
}
return Join.join("\n", result);
return Joiner.on("\n").join(result);
}
@Override

74
tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderAssignedActionTest.java
View file

@ -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<ActionFilterState, ActionFilterTransition> 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<ActionFilterState, ActionFilterTransition> 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 {

1
tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderNavigatorTest.java
View file

@ -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;

4
tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/SyntacticSequencerPDAProviderTest.java
View file

@ -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) {