Adapt to changed string factories
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/internal/docmlet/tex/core/model/LtxReconciler.java b/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/internal/docmlet/tex/core/model/LtxReconciler.java
index 26b8556..b0308fa 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/internal/docmlet/tex/core/model/LtxReconciler.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.core/src/org/eclipse/statet/internal/docmlet/tex/core/model/LtxReconciler.java
@@ -21,7 +21,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.statet.jcommons.string.InternStringCache;
+import org.eclipse.statet.jcommons.string.CacheStringFactory;
import org.eclipse.statet.jcommons.text.core.input.StringParserInput;
import org.eclipse.statet.docmlet.tex.core.TexCoreAccess;
@@ -85,7 +85,7 @@
private final Object raLock= new Object();
private final StringParserInput raInput= new StringParserInput(0x1000);
private final NowebLtxLexer raLexer= new NowebLtxLexer();
- private final LtxParser raParser= new LtxParser(this.raLexer, new InternStringCache(0x20));
+ private final LtxParser raParser= new LtxParser(this.raLexer, new CacheStringFactory(0x20));
private AstPrinter raDebugAstPrinter;
private final Object rmLock= new Object();
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/ast/WikidocParser.java b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/ast/WikidocParser.java
index 80d3cc5..f68ffbf 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/ast/WikidocParser.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/docmlet/wikitext/core/ast/WikidocParser.java
@@ -22,7 +22,8 @@
import org.eclipse.mylyn.wikitext.parser.LinkAttributes;
import org.eclipse.mylyn.wikitext.parser.Locator;
-import org.eclipse.statet.jcommons.string.InternStringFactory;
+import org.eclipse.statet.jcommons.lang.Nullable;
+import org.eclipse.statet.jcommons.string.BasicStringFactory;
import org.eclipse.statet.jcommons.string.StringFactory;
import org.eclipse.statet.jcommons.text.core.TextRegion;
import org.eclipse.statet.jcommons.text.core.util.HtmlUtils;
@@ -64,8 +65,8 @@
private List<Embedded> embeddedList;
- public WikidocParser(final StringFactory labelFactory) {
- this.labelFactory= (labelFactory != null) ? labelFactory : InternStringFactory.INSTANCE;
+ public WikidocParser(final @Nullable StringFactory labelFactory) {
+ this.labelFactory= (labelFactory != null) ? labelFactory : BasicStringFactory.INSTANCE;
}
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/internal/docmlet/wikitext/core/model/LtxReconcilerExtension.java b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/internal/docmlet/wikitext/core/model/LtxReconcilerExtension.java
index e3d097a..72b7869 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/internal/docmlet/wikitext/core/model/LtxReconcilerExtension.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/internal/docmlet/wikitext/core/model/LtxReconcilerExtension.java
@@ -19,7 +19,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.statet.jcommons.lang.NonNullByDefault;
-import org.eclipse.statet.jcommons.string.InternStringCache;
+import org.eclipse.statet.jcommons.string.CacheStringFactory;
import org.eclipse.statet.jcommons.text.core.input.StringParserInput;
import org.eclipse.statet.docmlet.tex.core.TexCore;
@@ -46,7 +46,7 @@
public LtxReconcilerExtension() {
- this.raParser= new LtxParser(null, new InternStringCache(0x20));
+ this.raParser= new LtxParser(null, new CacheStringFactory(0x20));
}
diff --git a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/internal/docmlet/wikitext/core/model/WikidocReconciler.java b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/internal/docmlet/wikitext/core/model/WikidocReconciler.java
index d95b61f..96e2a79 100644
--- a/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/internal/docmlet/wikitext/core/model/WikidocReconciler.java
+++ b/docmlet/org.eclipse.statet.docmlet.wikitext.core/src/org/eclipse/statet/internal/docmlet/wikitext/core/model/WikidocReconciler.java
@@ -25,7 +25,7 @@
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.text.AbstractDocument;
-import org.eclipse.statet.jcommons.string.InternStringCache;
+import org.eclipse.statet.jcommons.string.CacheStringFactory;
import org.eclipse.statet.docmlet.tex.core.model.TexModel;
import org.eclipse.statet.docmlet.wikitext.core.MarkupSourceModelStamp;
@@ -93,7 +93,7 @@
private final WikitextMarkupLanguageManager1 markupLanguageManager;
private final Object f1AstLock= new Object();
- private final WikidocParser f1Parser= new WikidocParser(new InternStringCache(0x20));
+ private final WikidocParser f1Parser= new WikidocParser(new CacheStringFactory(0x20));
private AstPrinter f1DebugAstPrinter;
private final Object f2ModelLock= new Object();
