[Test] Adapt to revised ecommons.text.core
diff --git a/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ecommons/text/BasicHeuristicTokenScanner.java b/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ecommons/text/BasicHeuristicTokenScanner.java
index d5cc8b4..3810d23 100644
--- a/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ecommons/text/BasicHeuristicTokenScanner.java
+++ b/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ecommons/text/BasicHeuristicTokenScanner.java
@@ -26,7 +26,7 @@
import org.eclipse.statet.jcommons.collections.IntArrayList;
import org.eclipse.statet.jcommons.collections.IntList;
-import org.eclipse.statet.ecommons.text.core.IPartitionConstraint;
+import org.eclipse.statet.ecommons.text.core.PartitionConstraint;
import org.eclipse.statet.ecommons.text.core.sections.IDocContentSections;
@@ -40,7 +40,7 @@
public class BasicHeuristicTokenScanner implements ITokenScanner {
- protected static final IPartitionConstraint ALL_PARTITIONS_CONSTRAINT= new IPartitionConstraint() {
+ protected static final PartitionConstraint ALL_PARTITIONS_CONSTRAINT= new PartitionConstraint() {
@Override
public boolean matches(final String partitionType) {
@@ -248,12 +248,12 @@
/** The partitioning being used for scanning. */
private final String partitioning;
- private final IPartitionConstraint defaultPartitionConstraint;
+ private final PartitionConstraint defaultPartitionConstraint;
/** The document being scanned. */
private IDocument document;
/** The partition to scan in. */
- private IPartitionConstraint partitionConstraint;
+ private PartitionConstraint partitionConstraint;
/* internal scan state */
@@ -269,7 +269,7 @@
public BasicHeuristicTokenScanner(final IDocContentSections documentContentInfo,
- final IPartitionConstraint defaultContentConstraint) {
+ final PartitionConstraint defaultContentConstraint) {
this.partitioning= documentContentInfo.getPartitioning();
this.defaultPartitionConstraint= defaultContentConstraint;
}
@@ -283,11 +283,11 @@
return this.partitioning;
}
- protected final IPartitionConstraint getDefaultPartitionConstraint() {
+ protected final PartitionConstraint getDefaultPartitionConstraint() {
return this.defaultPartitionConstraint;
}
- protected final IPartitionConstraint getPartitionConstraint() {
+ protected final PartitionConstraint getPartitionConstraint() {
return this.partitionConstraint;
}
@@ -358,7 +358,7 @@
public void configure(final IDocument document, final String partitionType) {
assert (document != null && partitionType != null);
this.document= document;
- this.partitionConstraint= new IPartitionConstraint() {
+ this.partitionConstraint= new PartitionConstraint() {
@Override
public boolean matches(final String partitionTypeToTest) {
return partitionType == partitionTypeToTest;
@@ -397,7 +397,7 @@
* @param document the document to scan
* @param partition the partition to scan in
*/
- public void configure(final IDocument document, final IPartitionConstraint partitionConstraint) {
+ public void configure(final IDocument document, final PartitionConstraint partitionConstraint) {
assert (document != null && partitionConstraint != null);
this.document= document;
this.partitionConstraint= partitionConstraint;
diff --git a/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ecommons/text/PairMatcher.java b/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ecommons/text/PairMatcher.java
index eae5311..b676a7d 100644
--- a/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ecommons/text/PairMatcher.java
+++ b/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ecommons/text/PairMatcher.java
@@ -24,7 +24,6 @@
import org.eclipse.jface.text.Region;
import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.statet.ecommons.text.core.IPartitionConstraint;
import org.eclipse.statet.ecommons.text.core.sections.IDocContentSections;
@@ -71,17 +70,15 @@
public PairMatcher(final char[][] pairs, final IDocContentSections documentContentInfo,
final String[] partitions, final char escapeChar) {
this(pairs, documentContentInfo.getPartitioning(), partitions,
- new BasicHeuristicTokenScanner(documentContentInfo, new IPartitionConstraint() {
- @Override
- public boolean matches(final String partitionType) {
- for (int i= 0; i < partitions.length; i++) {
- if (partitions[i] == partitionType) {
- return true;
+ new BasicHeuristicTokenScanner(documentContentInfo,
+ (final String partitionType) -> {
+ for (int i= 0; i < partitions.length; i++) {
+ if (partitions[i] == partitionType) {
+ return true;
+ }
}
- }
- return false;
- }
- }),
+ return false;
+ }),
escapeChar );
}
diff --git a/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ecommons/text/TextUtil.java b/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ecommons/text/TextUtil.java
index 1780b01..80b544a 100644
--- a/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ecommons/text/TextUtil.java
+++ b/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ecommons/text/TextUtil.java
@@ -34,7 +34,7 @@
import org.eclipse.jface.text.Region;
import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.statet.ecommons.text.core.IPartitionConstraint;
+import org.eclipse.statet.ecommons.text.core.PartitionConstraint;
/**
@@ -305,7 +305,7 @@
public static List<IRegion> getMatchingRegions(final AbstractDocument document,
- final String partitioning, final IPartitionConstraint contraint,
+ final String partitioning, final PartitionConstraint contraint,
final IRegion region, final boolean extend) throws BadLocationException, BadPartitioningException {
final List<IRegion> regions= new ArrayList<>();
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/BracketLevel.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/BracketLevel.java
index f98213a..1d57fea 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/BracketLevel.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/BracketLevel.java
@@ -36,8 +36,7 @@
import org.eclipse.swt.events.VerifyEvent;
import org.eclipse.ui.statushandlers.StatusManager;
-import org.eclipse.statet.ecommons.text.core.DocumentEnhancer;
-import org.eclipse.statet.ecommons.text.core.IDocumentEnhancement;
+import org.eclipse.statet.ecommons.text.core.DocumentEnhancement;
import org.eclipse.statet.ecommons.text.core.sections.IDocContentSections;
import org.eclipse.statet.ecommons.text.core.util.ExclusivePositionUpdater;
@@ -231,7 +230,7 @@
}
protected final DocumentData fetchDocumentData() {
- final IDocumentEnhancement documentEnhancement= DocumentEnhancer.get(this.document);
+ final DocumentEnhancement documentEnhancement= DocumentEnhancement.get(this.document);
if (documentEnhancement != null) {
DocumentData data= (DocumentData) documentEnhancement.getData(POSITION_CATEGORY);
if (data == null) {
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/AbstractMarkOccurrencesProvider.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/AbstractMarkOccurrencesProvider.java
index f26fd74..e9b84a7 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/AbstractMarkOccurrencesProvider.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/AbstractMarkOccurrencesProvider.java
@@ -30,7 +30,7 @@
import org.eclipse.swt.graphics.Point;
import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.statet.ecommons.text.core.IPartitionConstraint;
+import org.eclipse.statet.ecommons.text.core.PartitionConstraint;
import org.eclipse.statet.ltk.ast.core.util.AstSelection;
import org.eclipse.statet.ltk.core.ISourceModelStamp;
@@ -103,14 +103,14 @@
private final SourceEditor1 editor;
private final String partitioning;
- private final IPartitionConstraint toleratePartitions;
+ private final PartitionConstraint toleratePartitions;
private boolean isMarkEnabled;
private RunData lastRun;
public AbstractMarkOccurrencesProvider(final SourceEditor1 editor,
- final IPartitionConstraint toleratePartitions) {
+ final PartitionConstraint toleratePartitions) {
if (editor == null) {
throw new NullPointerException("editor");
}
