Adapt to changed string factories
diff --git a/r/org.eclipse.statet.r.core/src/org/eclipse/statet/internal/r/core/sourcemodel/RReconciler.java b/r/org.eclipse.statet.r.core/src/org/eclipse/statet/internal/r/core/sourcemodel/RReconciler.java
index 1e65300..c1db737 100644
--- a/r/org.eclipse.statet.r.core/src/org/eclipse/statet/internal/r/core/sourcemodel/RReconciler.java
+++ b/r/org.eclipse.statet.r.core/src/org/eclipse/statet/internal/r/core/sourcemodel/RReconciler.java
@@ -21,7 +21,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.statet.jcommons.collections.ImCollections;
-import org.eclipse.statet.jcommons.string.InternStringCache;
+import org.eclipse.statet.jcommons.string.CacheStringFactory;
import org.eclipse.statet.jcommons.string.StringFactory;
import org.eclipse.statet.jcommons.text.core.input.OffsetStringParserInput;
import org.eclipse.statet.jcommons.text.core.input.StringParserInput;
@@ -88,7 +88,7 @@
public RReconciler(final RModelManagerImpl manager) {
this.rManager= manager;
- this.raAstStringCache= new InternStringCache(0x20);
+ this.raAstStringCache= new CacheStringFactory(0x20);
this.raRoxygenParser= new RoxygenParser(this.raAstStringCache);
this.rmScopeAnalyzer= new SourceAnalyzer();
this.rpReporter= new RProblemReporter();
diff --git a/r/org.eclipse.statet.r.core/src/org/eclipse/statet/r/core/rsource/RLexer.java b/r/org.eclipse.statet.r.core/src/org/eclipse/statet/r/core/rsource/RLexer.java
index d1a5af1..488a5aa 100644
--- a/r/org.eclipse.statet.r.core/src/org/eclipse/statet/r/core/rsource/RLexer.java
+++ b/r/org.eclipse.statet.r.core/src/org/eclipse/statet/r/core/rsource/RLexer.java
@@ -31,9 +31,9 @@
import org.eclipse.statet.jcommons.lang.NonNullByDefault;
import org.eclipse.statet.jcommons.lang.Nullable;
import org.eclipse.statet.jcommons.string.StringFactory;
-import org.eclipse.statet.jcommons.string.StringUtils;
import org.eclipse.statet.jcommons.text.core.TextRegion;
import org.eclipse.statet.jcommons.text.core.input.TextParserInput;
+import org.eclipse.statet.jcommons.util.StringUtils;
import org.eclipse.statet.ltk.ast.core.StatusDetail;
diff --git a/redocs/org.eclipse.statet.redocs.r/src/org/eclipse/statet/redocs/r/core/model/RChunkReconciler.java b/redocs/org.eclipse.statet.redocs.r/src/org/eclipse/statet/redocs/r/core/model/RChunkReconciler.java
index 9e206b2..666490a 100644
--- a/redocs/org.eclipse.statet.redocs.r/src/org/eclipse/statet/redocs/r/core/model/RChunkReconciler.java
+++ b/redocs/org.eclipse.statet.redocs.r/src/org/eclipse/statet/redocs/r/core/model/RChunkReconciler.java
@@ -28,7 +28,7 @@
import org.eclipse.statet.jcommons.lang.NonNull;
import org.eclipse.statet.jcommons.lang.NonNullByDefault;
import org.eclipse.statet.jcommons.lang.Nullable;
-import org.eclipse.statet.jcommons.string.InternStringCache;
+import org.eclipse.statet.jcommons.string.CacheStringFactory;
import org.eclipse.statet.jcommons.text.core.BasicTextRegion;
import org.eclipse.statet.jcommons.text.core.TextLineInformation;
import org.eclipse.statet.jcommons.text.core.TextRegion;
@@ -73,7 +73,7 @@
private final @Nullable Matcher raChunkRefLineMatcher;
private final Matcher raChunkEndLineMatcher;
- private final RParser raParser= new RParser(AstInfo.LEVEL_MODEL_DEFAULT, new InternStringCache(0x20));
+ private final RParser raParser= new RParser(AstInfo.LEVEL_MODEL_DEFAULT, new CacheStringFactory(0x20));
private final StringParserInput raInput= new StringParserInput(0x1000);
protected final RProblemReporter rpReporter;
