From 9f674e43c3bdfe802e63632d96da28c01400a900 Mon Sep 17 00:00:00 2001 From: Moritz Eysholdt Date: Thu, 29 Jan 2015 10:50:03 +0100 Subject: [PATCH] [formatter] fixed a spelling mistake in a class name Change-Id: I959d92ba25319d72c0d1cd7bde44526c3e21c309 --- .../xtext/junit4/formatter/FormatterTester.java | 4 ++-- .../regionaccess/internal/EObjectTokens.java | 4 ++-- .../regionaccess/internal/NodeHidden.java | 2 +- ...cess.java => NodeModelBasedRegionAccess.java} | 16 ++++++++-------- .../regionaccess/internal/NodeRegion.java | 4 ++-- .../internal/NodeSemanticRegion.java | 2 +- .../regionaccess/internal/RegionAccessTest.xtend | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) rename plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/{NodeModelBaseRegionAccess.java => NodeModelBasedRegionAccess.java} (94%) diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/formatter/FormatterTester.java b/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/formatter/FormatterTester.java index 6f8be3068..993caca80 100644 --- a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/formatter/FormatterTester.java +++ b/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/formatter/FormatterTester.java @@ -20,7 +20,7 @@ import org.eclipse.xtext.formatting2.ITextReplacement; import org.eclipse.xtext.formatting2.TextReplacements; import org.eclipse.xtext.formatting2.debug.TextRegionsToString; import org.eclipse.xtext.formatting2.regionaccess.ITextRegionAccess; -import org.eclipse.xtext.formatting2.regionaccess.internal.NodeModelBaseRegionAccess; +import org.eclipse.xtext.formatting2.regionaccess.internal.NodeModelBasedRegionAccess; import org.eclipse.xtext.junit4.util.ParseHelper; import org.eclipse.xtext.nodemodel.INode; import org.eclipse.xtext.nodemodel.SyntaxErrorMessage; @@ -50,7 +50,7 @@ public class FormatterTester { private Provider formatterRequestProvider; @Inject - private Provider nodeModelTokenAccessBuilderProvider; + private Provider nodeModelTokenAccessBuilderProvider; @Inject private ParseHelper parseHelper; diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/EObjectTokens.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/EObjectTokens.java index 6af71845c..ff3f94688 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/EObjectTokens.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/EObjectTokens.java @@ -19,9 +19,9 @@ import org.eclipse.xtext.nodemodel.INode; */ public class EObjectTokens extends AbstractEObjectTokens { private final INode node; - private final NodeModelBaseRegionAccess tokenAccess; + private final NodeModelBasedRegionAccess tokenAccess; - public EObjectTokens(NodeModelBaseRegionAccess tokenAccess, INode node) { + public EObjectTokens(NodeModelBasedRegionAccess tokenAccess, INode node) { super(); this.tokenAccess = tokenAccess; this.node = node; diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeHidden.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeHidden.java index 967dd83ad..9dffc635a 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeHidden.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeHidden.java @@ -21,7 +21,7 @@ public class NodeHidden extends NodeRegion implements IHiddenRegionPart { private final HiddenRegion hiddenRegion; protected NodeHidden(HiddenRegion gap, INode node) { - super((NodeModelBaseRegionAccess) gap.getTextRegionAccess(), node); + super((NodeModelBasedRegionAccess) gap.getTextRegionAccess(), node); this.hiddenRegion = gap; } diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBaseRegionAccess.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBasedRegionAccess.java similarity index 94% rename from plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBaseRegionAccess.java rename to plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBasedRegionAccess.java index 21a3db203..9d924a737 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBaseRegionAccess.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBasedRegionAccess.java @@ -35,7 +35,7 @@ import com.google.common.collect.Maps; /** * @author Moritz Eysholdt - Initial contribution and API */ -public class NodeModelBaseRegionAccess extends AbstractRegionAccess { +public class NodeModelBasedRegionAccess extends AbstractRegionAccess { public static class Builder extends AbstractRegionAccess.Builder { @@ -45,7 +45,7 @@ public class NodeModelBaseRegionAccess extends AbstractRegionAccess { private EObjectTokens lastTokens; private XtextResource resource; - protected boolean add(NodeModelBaseRegionAccess tokenAccess, INode node) { + protected boolean add(NodeModelBasedRegionAccess tokenAccess, INode node) { EObject semanticElement = tokenAccess.findSemanticElement(node); if (lastTokens == null || semanticElement != lastTokens.getSemanticElement()) lastTokens = eObjToTokens.get(semanticElement); @@ -100,8 +100,8 @@ public class NodeModelBaseRegionAccess extends AbstractRegionAccess { return result; } - public NodeModelBaseRegionAccess create() { - NodeModelBaseRegionAccess tokenAccess = new NodeModelBaseRegionAccess(this); + public NodeModelBasedRegionAccess create() { + NodeModelBasedRegionAccess tokenAccess = new NodeModelBasedRegionAccess(this); // System.out.println(tokenAccess); return tokenAccess; } @@ -117,11 +117,11 @@ public class NodeModelBaseRegionAccess extends AbstractRegionAccess { return new NodeWhitespace(gap, node); } - protected NodeSemanticRegion createToken(NodeModelBaseRegionAccess tokenAccess, INode node) { + protected NodeSemanticRegion createToken(NodeModelBasedRegionAccess tokenAccess, INode node) { return new NodeSemanticRegion(tokenAccess, node); } - protected EObjectTokens createTokens(NodeModelBaseRegionAccess access, INode node) { + protected EObjectTokens createTokens(NodeModelBasedRegionAccess access, INode node) { return new EObjectTokens(access, node); } @@ -131,7 +131,7 @@ public class NodeModelBaseRegionAccess extends AbstractRegionAccess { this.lastTokenOrGap = null; this.lastTokens = null; this.firstToken = null; - NodeModelBaseRegionAccess access = (NodeModelBaseRegionAccess) tokenAccess; + NodeModelBasedRegionAccess access = (NodeModelBasedRegionAccess) tokenAccess; ICompositeNode rootNode = resource.getParseResult().getRootNode(); TreeIterator iterator = rootNode.getAsTreeIterable().iterator(); while (iterator.hasNext()) { @@ -229,7 +229,7 @@ public class NodeModelBaseRegionAccess extends AbstractRegionAccess { } } - protected NodeModelBaseRegionAccess(Builder builder) { + protected NodeModelBasedRegionAccess(Builder builder) { super(builder); } diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeRegion.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeRegion.java index f6f404e33..4ad57eb10 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeRegion.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeRegion.java @@ -18,9 +18,9 @@ import org.eclipse.xtext.nodemodel.INode; */ public class NodeRegion extends AbstractTextSegment { private final INode node; - private final NodeModelBaseRegionAccess tokenAccess; + private final NodeModelBasedRegionAccess tokenAccess; - protected NodeRegion(NodeModelBaseRegionAccess tokenAccess, INode node) { + protected NodeRegion(NodeModelBasedRegionAccess tokenAccess, INode node) { super(); this.tokenAccess = tokenAccess; this.node = node; diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeSemanticRegion.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeSemanticRegion.java index 3100d206c..fc38e833b 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeSemanticRegion.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeSemanticRegion.java @@ -21,7 +21,7 @@ public class NodeSemanticRegion extends NodeRegion implements ISemanticRegion { private IHiddenRegion leading; private IHiddenRegion trailing; - protected NodeSemanticRegion(NodeModelBaseRegionAccess tokenAccess, INode node) { + protected NodeSemanticRegion(NodeModelBasedRegionAccess tokenAccess, INode node) { super(tokenAccess, node); } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTest.xtend b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTest.xtend index 713aff9fe..4699421e2 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTest.xtend +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTest.xtend @@ -96,7 +96,7 @@ class RegionAccessTest { private def ===(CharSequence file, CharSequence expectation) { val obj = parseHelper.parse(file) - val access = new NodeModelBaseRegionAccess.Builder().withResource(obj.eResource as XtextResource).create + val access = new org.eclipse.xtext.formatting2.regionaccess.internal.NodeModelBasedRegionAccess.Builder().withResource(obj.eResource as XtextResource).create val actual = new TokenAccessToString().withOrigin(access).hideColumnExplanation().toString Assert.assertEquals(expectation.toString, actual + "\n") }