Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMickael Istria2017-02-22 09:36:16 +0000
committerMickael Istria2017-02-22 09:36:16 +0000
commit5985a1edc5adad4a81892f9229e3269c8b25e794 (patch)
treef2e22d5f2dcf9c9e1cea27a908ab18fdc7619c04
parent92a0d5c389d95693544840b4f1c25f670ea4b0f7 (diff)
downloadeclipse.platform.text-5985a1edc5adad4a81892f9229e3269c8b25e794.tar.gz
eclipse.platform.text-5985a1edc5adad4a81892f9229e3269c8b25e794.tar.xz
eclipse.platform.text-5985a1edc5adad4a81892f9229e3269c8b25e794.zip
Change-Id: Ic7c21de2fd9cb2e5e67addd23a80b64104343168 Signed-off-by: Mickael Istria <mistria@redhat.com>
-rw-r--r--org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ExtensionBasedTextViewerConfiguration.java11
-rw-r--r--org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/markers/MarkerInformationControl.java4
2 files changed, 6 insertions, 9 deletions
diff --git a/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ExtensionBasedTextViewerConfiguration.java b/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ExtensionBasedTextViewerConfiguration.java
index 9d96612f26b..5d21e4fd75d 100644
--- a/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ExtensionBasedTextViewerConfiguration.java
+++ b/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ExtensionBasedTextViewerConfiguration.java
@@ -17,13 +17,9 @@ import java.util.List;
import java.util.Queue;
import java.util.Set;
-import org.eclipse.swt.widgets.Shell;
-
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.content.IContentType;
-
import org.eclipse.jface.preference.IPreferenceStore;
-
import org.eclipse.jface.text.AbstractReusableInformationControlCreator;
import org.eclipse.jface.text.DefaultInformationControl;
import org.eclipse.jface.text.IDocument;
@@ -38,15 +34,13 @@ import org.eclipse.jface.text.presentation.IPresentationReconciler;
import org.eclipse.jface.text.quickassist.IQuickAssistAssistant;
import org.eclipse.jface.text.quickassist.QuickAssistAssistant;
import org.eclipse.jface.text.source.ISourceViewer;
-
+import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IPropertyListener;
-
-import org.eclipse.ui.texteditor.ITextEditor;
-
import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
import org.eclipse.ui.internal.editors.text.EditorsPlugin;
import org.eclipse.ui.internal.genericeditor.markers.MarkerResoltionQuickAssistProcessor;
+import org.eclipse.ui.texteditor.ITextEditor;
/**
* The configuration of the {@link ExtensionBasedTextEditor}. It registers the proxy composite
@@ -55,6 +49,7 @@ import org.eclipse.ui.internal.genericeditor.markers.MarkerResoltionQuickAssistP
*
* @since 1.0
*/
+@SuppressWarnings("restriction")
public final class ExtensionBasedTextViewerConfiguration extends TextSourceViewerConfiguration implements IDocumentPartitioningListener {
private ITextEditor editor;
diff --git a/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/markers/MarkerInformationControl.java b/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/markers/MarkerInformationControl.java
index 5a1cd3e0228..98bf713d93b 100644
--- a/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/markers/MarkerInformationControl.java
+++ b/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/markers/MarkerInformationControl.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.ui.internal.genericeditor.markers;
+import java.util.Collection;
import java.util.List;
import org.eclipse.core.resources.IMarker;
@@ -53,7 +54,7 @@ public class MarkerInformationControl extends AbstractInformationControl impleme
create();
}
- private List<IMarker> markers;
+ private Collection<IMarker> markers;
private Composite parent;
@Override
@@ -80,6 +81,7 @@ public class MarkerInformationControl extends AbstractInformationControl impleme
return null;
}
+ @SuppressWarnings("unchecked")
@Override
public void setInput(Object input) {
this.markers = (List<IMarker>)input;

Back to the top