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 3810d23..3a4ce6f 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
@@ -27,7 +27,7 @@
import org.eclipse.statet.jcommons.collections.IntList;
import org.eclipse.statet.ecommons.text.core.PartitionConstraint;
-import org.eclipse.statet.ecommons.text.core.sections.IDocContentSections;
+import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
/**
@@ -268,7 +268,7 @@
private StopCondition nonWSorLRCondition;
- public BasicHeuristicTokenScanner(final IDocContentSections documentContentInfo,
+ public BasicHeuristicTokenScanner(final DocContentSections documentContentInfo,
final PartitionConstraint defaultContentConstraint) {
this.partitioning= documentContentInfo.getPartitioning();
this.defaultPartitionConstraint= defaultContentConstraint;
diff --git a/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ecommons/text/MultiContentSectionCharPairMatcher.java b/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ecommons/text/MultiContentSectionCharPairMatcher.java
index c936a1a..01974ca 100644
--- a/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ecommons/text/MultiContentSectionCharPairMatcher.java
+++ b/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ecommons/text/MultiContentSectionCharPairMatcher.java
@@ -20,7 +20,7 @@
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
-import org.eclipse.statet.ecommons.text.core.sections.IDocContentSections;
+import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
/**
@@ -30,7 +30,7 @@
* Implement {@link #createHandler(String)} for lazy initialization of the matchers of the section
* types.
*
- * @see IDocContentSections
+ * @see DocContentSections
*/
public class MultiContentSectionCharPairMatcher implements ICharPairMatcher {
@@ -38,26 +38,26 @@
private static final Object NULL= new Object();
- private final IDocContentSections sections;
+ private final DocContentSections sections;
private final Map<String, Object> handlers= new IdentityHashMap<>(8);
private ICharPairMatcher activeMatcher;
- public MultiContentSectionCharPairMatcher(final IDocContentSections sections) {
+ public MultiContentSectionCharPairMatcher(final DocContentSections sections) {
if (sections == null) {
throw new NullPointerException("sections"); //$NON-NLS-1$
}
this.sections= sections;
}
- public MultiContentSectionCharPairMatcher(final IDocContentSections sections,
+ public MultiContentSectionCharPairMatcher(final DocContentSections sections,
final String sectionType1, final ICharPairMatcher matcher1) {
this(sections, sectionType1, matcher1, null, null);
}
- public MultiContentSectionCharPairMatcher(final IDocContentSections sections,
+ public MultiContentSectionCharPairMatcher(final DocContentSections sections,
final String sectionType1, final ICharPairMatcher matcher1,
final String sectionType2, final ICharPairMatcher matcher2) {
this(sections);
@@ -71,7 +71,7 @@
}
- protected IDocContentSections getSections() {
+ protected DocContentSections getSections() {
return this.sections;
}
@@ -94,7 +94,7 @@
}
protected final ICharPairMatcher getHandler(final String sectionType) {
- if (sectionType == IDocContentSections.ERROR) {
+ if (sectionType == DocContentSections.ERROR) {
return null;
}
Object handler= this.handlers.get(sectionType);
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 b676a7d..d4d68bd 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,7 @@
import org.eclipse.jface.text.Region;
import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.statet.ecommons.text.core.sections.IDocContentSections;
+import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
/**
@@ -67,7 +67,7 @@
/**
* Constructor using <code>BasicHeuristicTokenScanner</code>.
*/
- public PairMatcher(final char[][] pairs, final IDocContentSections documentContentInfo,
+ public PairMatcher(final char[][] pairs, final DocContentSections documentContentInfo,
final String[] partitions, final char escapeChar) {
this(pairs, documentContentInfo.getPartitioning(), partitions,
new BasicHeuristicTokenScanner(documentContentInfo,
diff --git a/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ltk/model/core/elements/ISourceUnit.java b/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ltk/model/core/elements/ISourceUnit.java
index d2a48d0..7e54352 100644
--- a/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ltk/model/core/elements/ISourceUnit.java
+++ b/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ltk/model/core/elements/ISourceUnit.java
@@ -22,7 +22,7 @@
import org.eclipse.jface.text.IDocumentExtension4;
import org.eclipse.jface.text.ISynchronizable;
-import org.eclipse.statet.ecommons.text.core.sections.IDocContentSections;
+import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
import org.eclipse.statet.ltk.ast.core.AstInfo;
import org.eclipse.statet.ltk.core.SourceContent;
@@ -90,7 +90,7 @@
*
* @return the document content information
*/
- IDocContentSections getDocumentContentInfo();
+ DocContentSections getDocumentContentInfo();
/**
* Returns the current stamp of the content of this source unit.
diff --git a/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ltk/model/core/impl/GenericSourceUnitWorkingCopy.java b/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ltk/model/core/impl/GenericSourceUnitWorkingCopy.java
index 81cadf1..5e67c8d 100644
--- a/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ltk/model/core/impl/GenericSourceUnitWorkingCopy.java
+++ b/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ltk/model/core/impl/GenericSourceUnitWorkingCopy.java
@@ -21,7 +21,7 @@
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.jface.text.AbstractDocument;
-import org.eclipse.statet.ecommons.text.core.sections.IDocContentSections;
+import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
import org.eclipse.statet.ltk.ast.core.AstInfo;
import org.eclipse.statet.ltk.core.ElementName;
@@ -138,7 +138,7 @@
}
@Override
- public IDocContentSections getDocumentContentInfo() {
+ public DocContentSections getDocumentContentInfo() {
return this.from.getDocumentContentInfo();
}
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 556a720..6d7abad 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
@@ -37,7 +37,7 @@
import org.eclipse.ui.statushandlers.StatusManager;
import org.eclipse.statet.ecommons.text.core.DocumentEnhancement;
-import org.eclipse.statet.ecommons.text.core.sections.IDocContentSections;
+import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
import org.eclipse.statet.ecommons.text.core.util.ExclusivePositionUpdater;
import org.eclipse.statet.ecommons.ui.swt.WidgetUtils;
@@ -163,7 +163,7 @@
private final IDocument document;
- private final IDocContentSections documentContentInfo;
+ private final DocContentSections documentContentInfo;
private final List<LinkedPosition> positions;
private final int mode;
@@ -173,7 +173,7 @@
public BracketLevel(final LinkedModeModel model,
- final IDocument document, final IDocContentSections documentContentInfo,
+ final IDocument document, final DocContentSections documentContentInfo,
final List<LinkedPosition> positions, final int mode) {
this.document= document;
this.documentContentInfo= documentContentInfo;
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/AbstractAutoEditStrategy.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/AbstractAutoEditStrategy.java
index 17e3bdf..b1067c6 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/AbstractAutoEditStrategy.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/AbstractAutoEditStrategy.java
@@ -39,7 +39,7 @@
import org.eclipse.statet.ecommons.text.IIndentSettings;
import org.eclipse.statet.ecommons.text.ITokenScanner;
import org.eclipse.statet.ecommons.text.IndentUtil;
-import org.eclipse.statet.ecommons.text.core.sections.IDocContentSections;
+import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
import org.eclipse.statet.ecommons.text.core.treepartitioner.TreePartition;
import org.eclipse.statet.ecommons.ui.util.UIAccess;
@@ -56,7 +56,7 @@
private final ISourceEditor editor;
private final ITextEditorExtension3 editor3;
- private final IDocContentSections documentContentInfo;
+ private final DocContentSections documentContentInfo;
private final SourceViewer viewer;
private AbstractDocument document;
@@ -84,7 +84,7 @@
return this.editor3;
}
- public final IDocContentSections getDocumentContentInfo() {
+ public final DocContentSections getDocumentContentInfo() {
return this.documentContentInfo;
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/ISourceEditor.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/ISourceEditor.java
index fdd3e2b..17a22e5 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/ISourceEditor.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/ISourceEditor.java
@@ -25,7 +25,7 @@
import org.eclipse.statet.jcommons.lang.Nullable;
import org.eclipse.statet.jcommons.text.core.TextRegion;
-import org.eclipse.statet.ecommons.text.core.sections.IDocContentSections;
+import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
import org.eclipse.statet.ltk.model.core.elements.ISourceUnit;
import org.eclipse.statet.ltk.ui.util.LTKSelectionUtils;
@@ -79,7 +79,7 @@
*
* @return the document content information
*/
- IDocContentSections getDocumentContentInfo();
+ DocContentSections getDocumentContentInfo();
/**
* Returns whether the text in this text editor (SourceViewer) can be changed by the user
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/MultiContentSectionInformationProvider.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/MultiContentSectionInformationProvider.java
index be2476c..dbda0ab 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/MultiContentSectionInformationProvider.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/MultiContentSectionInformationProvider.java
@@ -24,7 +24,7 @@
import org.eclipse.jface.text.information.IInformationProviderExtension;
import org.eclipse.jface.text.information.IInformationProviderExtension2;
-import org.eclipse.statet.ecommons.text.core.sections.IDocContentSections;
+import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
/**
@@ -34,7 +34,7 @@
* Implement {@link #createHandler(String)} for lazy initialization of the information provider
* of the section types.
*
- * @see IDocContentSections
+ * @see DocContentSections
*/
public class MultiContentSectionInformationProvider implements
IInformationProvider, IInformationProviderExtension, IInformationProviderExtension2 {
@@ -43,26 +43,26 @@
private static final Object NULL= new Object();
- private final IDocContentSections sections;
+ private final DocContentSections sections;
private final Map<String, Object> handlers= new IdentityHashMap<>(8);
private EditorInformationProvider activeProvider;
- public MultiContentSectionInformationProvider(final IDocContentSections sections) {
+ public MultiContentSectionInformationProvider(final DocContentSections sections) {
if (sections == null) {
throw new NullPointerException("sections"); //$NON-NLS-1$
}
this.sections= sections;
}
- public MultiContentSectionInformationProvider(final IDocContentSections sections,
+ public MultiContentSectionInformationProvider(final DocContentSections sections,
final String key1, final EditorInformationProvider provider1) {
this(sections, key1, provider1, null, null);
}
- public MultiContentSectionInformationProvider(final IDocContentSections sections,
+ public MultiContentSectionInformationProvider(final DocContentSections sections,
final String sectionType1, final EditorInformationProvider provider1,
final String sectionType2, final EditorInformationProvider provider2) {
this(sections);
@@ -76,7 +76,7 @@
}
- protected final IDocContentSections getSections() {
+ protected final DocContentSections getSections() {
return this.sections;
}
@@ -89,7 +89,7 @@
}
protected final EditorInformationProvider getProvider(final String sectionType) {
- if (sectionType == IDocContentSections.ERROR) {
+ if (sectionType == DocContentSections.ERROR) {
return null;
}
Object handler= this.handlers.get(sectionType);
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/MultiContentSectionSourceViewerConfiguration.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/MultiContentSectionSourceViewerConfiguration.java
index 32a8fa2..119272f 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/MultiContentSectionSourceViewerConfiguration.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/MultiContentSectionSourceViewerConfiguration.java
@@ -35,7 +35,7 @@
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.ui.statushandlers.StatusManager;
-import org.eclipse.statet.ecommons.text.core.sections.IDocContentSections;
+import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
import org.eclipse.statet.ecommons.ui.dialogs.DialogUtils;
import org.eclipse.statet.internal.ltk.ui.LTKUIPlugin;
@@ -131,14 +131,14 @@
}
- private final IDocContentSections sections;
+ private final DocContentSections sections;
private SourceEditorViewerConfiguration primaryConfig;
private final Map<String, SourceEditorViewerConfiguration> secondaryConfigs= new IdentityHashMap<>(8);
private final Map<String, Integer> secondaryConfigStates= new IdentityHashMap<>();
- public MultiContentSectionSourceViewerConfiguration(final IDocContentSections sections, final int flags,
+ public MultiContentSectionSourceViewerConfiguration(final DocContentSections sections, final int flags,
final ISourceEditor sourceEditor) {
super(sections, flags, sourceEditor);
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditor1.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditor1.java
index 6e2e6c9..5ffc0c8 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditor1.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditor1.java
@@ -90,7 +90,7 @@
import org.eclipse.statet.ecommons.preferences.core.util.PreferenceUtils;
import org.eclipse.statet.ecommons.text.ICharPairMatcher;
import org.eclipse.statet.ecommons.text.core.JFaceTextRegion;
-import org.eclipse.statet.ecommons.text.core.sections.IDocContentSections;
+import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
import org.eclipse.statet.ecommons.text.ui.TextHandlerUtil;
import org.eclipse.statet.ecommons.ui.ISettingsChangedHandler;
import org.eclipse.statet.ecommons.ui.util.UIAccess;
@@ -496,7 +496,7 @@
}
@Override
- public IDocContentSections getDocumentContentInfo() {
+ public DocContentSections getDocumentContentInfo() {
return this.configurator.getDocumentContentInfo();
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorViewerConfiguration.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorViewerConfiguration.java
index 1a831e5..2c50d87 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorViewerConfiguration.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorViewerConfiguration.java
@@ -66,7 +66,7 @@
import org.eclipse.statet.ecommons.text.ICharPairMatcher;
import org.eclipse.statet.ecommons.text.IIndentSettings;
import org.eclipse.statet.ecommons.text.IndentUtil;
-import org.eclipse.statet.ecommons.text.core.sections.IDocContentSections;
+import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
import org.eclipse.statet.ecommons.text.ui.DefaultBrowserInformationInput;
import org.eclipse.statet.ecommons.text.ui.presentation.ITextPresentationConstants;
import org.eclipse.statet.ecommons.text.ui.settings.DecorationPreferences;
@@ -165,7 +165,7 @@
};
- private final IDocContentSections documentContentInfo;
+ private final DocContentSections documentContentInfo;
private final int flags;
@@ -188,7 +188,7 @@
private Map<Integer, ITextHover> infoHoverCache;
- public SourceEditorViewerConfiguration(final IDocContentSections documentContentInfo, final int flags,
+ public SourceEditorViewerConfiguration(final DocContentSections documentContentInfo, final int flags,
final ISourceEditor sourceEditor) {
if (documentContentInfo == null) {
throw new NullPointerException("documentContentInfo"); //$NON-NLS-1$
@@ -257,7 +257,7 @@
return this.editor;
}
- public final IDocContentSections getDocumentContentInfo() {
+ public final DocContentSections getDocumentContentInfo() {
return this.documentContentInfo;
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorViewerConfigurator.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorViewerConfigurator.java
index 1903581..947d267 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorViewerConfigurator.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorViewerConfigurator.java
@@ -37,7 +37,7 @@
import org.eclipse.ui.texteditor.spelling.SpellingProblem;
import org.eclipse.statet.ecommons.text.IIndentSettings;
-import org.eclipse.statet.ecommons.text.core.sections.IDocContentSections;
+import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
import org.eclipse.statet.ecommons.text.ui.presentation.ITextPresentationConstants;
import org.eclipse.statet.ecommons.text.ui.settings.DecorationPreferences;
import org.eclipse.statet.ecommons.ui.ISettingsChangedHandler;
@@ -81,7 +81,7 @@
*/
public abstract IDocumentSetupParticipant getDocumentSetupParticipant();
- public final IDocContentSections getDocumentContentInfo() {
+ public final DocContentSections getDocumentContentInfo() {
return this.configuration.getDocumentContentInfo();
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/ViewerSourceEditorAdapter.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/ViewerSourceEditorAdapter.java
index f1e1abf..6d96fb1 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/ViewerSourceEditorAdapter.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/ViewerSourceEditorAdapter.java
@@ -19,7 +19,7 @@
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.services.IServiceLocator;
-import org.eclipse.statet.ecommons.text.core.sections.IDocContentSections;
+import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
import org.eclipse.statet.ecommons.ui.util.UIAccess;
import org.eclipse.statet.ltk.model.core.elements.ISourceUnit;
@@ -74,7 +74,7 @@
}
@Override
- public IDocContentSections getDocumentContentInfo() {
+ public DocContentSections getDocumentContentInfo() {
return this.configurator.getDocumentContentInfo();
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/actions/MultiContentSectionElementSearchContributionItem.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/actions/MultiContentSectionElementSearchContributionItem.java
index 3d456ee..e874783 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/actions/MultiContentSectionElementSearchContributionItem.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/actions/MultiContentSectionElementSearchContributionItem.java
@@ -27,7 +27,7 @@
import org.eclipse.ui.menus.IWorkbenchContribution;
import org.eclipse.ui.services.IServiceLocator;
-import org.eclipse.statet.ecommons.text.core.sections.IDocContentSections;
+import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
import org.eclipse.statet.ecommons.ui.actions.ListContributionItem;
import org.eclipse.statet.ecommons.ui.util.UIAccess;
@@ -41,7 +41,7 @@
* Implement {@link #createItem(String)} for lazy initialization of the contribution items of the
* section types.
*
- * @see IDocContentSections
+ * @see DocContentSections
*/
public class MultiContentSectionElementSearchContributionItem extends ListContributionItem
implements IWorkbenchContribution, IExecutableExtension {
@@ -50,7 +50,7 @@
private static final Object NULL= new Object();
- private final IDocContentSections sections;
+ private final DocContentSections sections;
private final Map<String, Object> items= new IdentityHashMap<>(8);
@@ -59,7 +59,7 @@
private IServiceLocator serviceLocator;
- public MultiContentSectionElementSearchContributionItem(final IDocContentSections sections) {
+ public MultiContentSectionElementSearchContributionItem(final DocContentSections sections) {
super();
if (sections == null) {
throw new NullPointerException("sections"); //$NON-NLS-1$
@@ -67,12 +67,12 @@
this.sections= sections;
}
- public MultiContentSectionElementSearchContributionItem(final IDocContentSections sections,
+ public MultiContentSectionElementSearchContributionItem(final DocContentSections sections,
final String sectionType1, final ListContributionItem item1) {
this(sections, sectionType1, item1, null, null);
}
- public MultiContentSectionElementSearchContributionItem(final IDocContentSections sections,
+ public MultiContentSectionElementSearchContributionItem(final DocContentSections sections,
final String sectionType1, final ListContributionItem item1,
final String sectionType2, final ListContributionItem item2) {
this(sections);
@@ -114,7 +114,7 @@
}
- protected final IDocContentSections getSections() {
+ protected final DocContentSections getSections() {
return this.sections;
}
@@ -140,7 +140,7 @@
}
protected final ListContributionItem getItem(final String sectionType) {
- if (sectionType == IDocContentSections.ERROR) {
+ if (sectionType == DocContentSections.ERROR) {
return null;
}
Object item= this.items.get(sectionType);
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/actions/MultiContentSectionHandler.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/actions/MultiContentSectionHandler.java
index 070aafb..397fd8b 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/actions/MultiContentSectionHandler.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/actions/MultiContentSectionHandler.java
@@ -24,7 +24,7 @@
import org.eclipse.jface.text.source.SourceViewer;
import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.statet.ecommons.text.core.sections.IDocContentSections;
+import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
import org.eclipse.statet.ecommons.ui.workbench.WorkbenchUIUtils;
import org.eclipse.statet.ltk.ui.sourceediting.ISourceEditor;
@@ -36,7 +36,7 @@
* Implement {@link #createHandler(String)} for lazy initialization of the command handlers
* of the section types.
*
- * @see IDocContentSections
+ * @see DocContentSections
*/
public class MultiContentSectionHandler extends AbstractHandler {
@@ -44,26 +44,26 @@
private static final Object NULL= new Object();
- private final IDocContentSections sections;
+ private final DocContentSections sections;
private final Map<String, Object> handlers= new IdentityHashMap<>(8);
private ISourceEditor expliciteEditor;
- public MultiContentSectionHandler(final IDocContentSections sections) {
+ public MultiContentSectionHandler(final DocContentSections sections) {
if (sections == null) {
throw new NullPointerException("sections"); //$NON-NLS-1$
}
this.sections= sections;
}
- public MultiContentSectionHandler(final IDocContentSections sections,
+ public MultiContentSectionHandler(final DocContentSections sections,
final String sectionType1, final IHandler2 handler1) {
this(sections, sectionType1, handler1, null, null);
}
- public MultiContentSectionHandler(final IDocContentSections sections,
+ public MultiContentSectionHandler(final DocContentSections sections,
final String sectionType1, final IHandler2 handler1,
final String sectionType2, final IHandler2 handler2) {
this(sections);
@@ -81,7 +81,7 @@
this.expliciteEditor= editor;
}
- protected final IDocContentSections getSections() {
+ protected final DocContentSections getSections() {
return this.sections;
}
@@ -119,7 +119,7 @@
}
protected final IHandler2 getHandler(final String sectionType) {
- if (sectionType == IDocContentSections.ERROR) {
+ if (sectionType == DocContentSections.ERROR) {
return null;
}
Object handler= this.handlers.get(sectionType);
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/MultiContentSectionQuickAssistProcessor.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/MultiContentSectionQuickAssistProcessor.java
index 2db0b60..98a55fb 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/MultiContentSectionQuickAssistProcessor.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/assist/MultiContentSectionQuickAssistProcessor.java
@@ -22,7 +22,7 @@
import org.eclipse.jface.text.quickassist.IQuickAssistProcessor;
import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.statet.ecommons.text.core.sections.IDocContentSections;
+import org.eclipse.statet.ecommons.text.core.sections.DocContentSections;
/**
@@ -32,7 +32,7 @@
* Implement {@link #createProcessor(String)} for lazy initialization of the processors of the
* section types.
*
- * @see IDocContentSections
+ * @see DocContentSections
*/
public class MultiContentSectionQuickAssistProcessor implements IQuickAssistProcessor {
@@ -40,14 +40,14 @@
private static final Object NULL= new Object();
- private final IDocContentSections sections;
+ private final DocContentSections sections;
private final Map<String, Object> processors= new IdentityHashMap<>(8);
private String errorMessage;
- public MultiContentSectionQuickAssistProcessor(final IDocContentSections sections) {
+ public MultiContentSectionQuickAssistProcessor(final DocContentSections sections) {
if (sections == null) {
throw new NullPointerException("sections"); //$NON-NLS-1$
}
@@ -63,7 +63,7 @@
}
protected final IQuickAssistProcessor getProcessor(final String sectionType) {
- if (sectionType == IDocContentSections.ERROR) {
+ if (sectionType == DocContentSections.ERROR) {
return null;
}
Object processor= this.processors.get(sectionType);
