From 8798c561ff1533f203143d99bd188da135dd9d30 Mon Sep 17 00:00:00 2001 From: Sebastian Zarnekow Date: Mon, 27 Apr 2015 13:54:05 +0200 Subject: [PATCH] [idea] Fixup merge / rebase problems --- .../regionaccess/internal/NodeModelBasedRegionAccess.java | 4 +--- .../regionaccess/internal/StringBasedRegionAccess.java | 2 -- .../regionaccess/internal/StringEObjectRegion.java | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBasedRegionAccess.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBasedRegionAccess.java index 945fbe8ec..497608b2b 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBasedRegionAccess.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBasedRegionAccess.java @@ -7,7 +7,6 @@ *******************************************************************************/ package org.eclipse.xtext.formatting2.regionaccess.internal; -import java.util.List; import java.util.Map; import org.eclipse.emf.ecore.EObject; @@ -15,7 +14,6 @@ import org.eclipse.xtext.formatting2.regionaccess.IEObjectRegion; import org.eclipse.xtext.formatting2.regionaccess.ITextSegment; import org.eclipse.xtext.resource.XtextResource; -import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; /** @@ -65,5 +63,5 @@ public class NodeModelBasedRegionAccess extends AbstractRegionAccess { public boolean hasSyntaxError() { return resource.getParseResult().hasSyntaxErrors(); } - + } diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringBasedRegionAccess.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringBasedRegionAccess.java index c8265ada0..b3d0757cb 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringBasedRegionAccess.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringBasedRegionAccess.java @@ -7,7 +7,6 @@ *******************************************************************************/ package org.eclipse.xtext.formatting2.regionaccess.internal; -import java.util.List; import java.util.Map; import org.eclipse.emf.ecore.EObject; @@ -15,7 +14,6 @@ import org.eclipse.xtext.formatting2.regionaccess.IEObjectRegion; import org.eclipse.xtext.formatting2.regionaccess.ITextSegment; import org.eclipse.xtext.resource.XtextResource; -import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; /** diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringEObjectRegion.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringEObjectRegion.java index 053202d53..ff43decea 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringEObjectRegion.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringEObjectRegion.java @@ -19,5 +19,4 @@ public class StringEObjectRegion extends AbstractEObjectRegion { this.setGrammarElement(grammarElement); this.setSemantcElement(semanticElement); } - } \ No newline at end of file