From b6b48fbb1efc77cea2fb11a8db30a87849965a8a Mon Sep 17 00:00:00 2001
From: Mickael Istria
Date: Wed, 9 Nov 2016 11:05:15 +0100
Subject: [Generic Editor] Code cleanup

Change-Id: Idd22c81f4aa102c4a808f3d1868806244aa86017
Signed-off-by: Mickael Istria <mistria@redhat.com>
---
 .../ui/internal/genericeditor/AnnotationHoverDelegate.java    |  1 +
 .../genericeditor/CompositeContentAssistProcessor.java        | 11 +++++------
 .../ui/internal/genericeditor/ExtensionBasedTextEditor.java   |  1 -
 .../ui/internal/genericeditor/OrderedExtensionComparator.java |  4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'org.eclipse.ui.genericeditor/src')

diff --git a/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/AnnotationHoverDelegate.java b/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/AnnotationHoverDelegate.java
index 7eb4e2e228c..ba9f0e5f9a6 100644
--- a/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/AnnotationHoverDelegate.java
+++ b/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/AnnotationHoverDelegate.java
@@ -53,6 +53,7 @@ public class AnnotationHoverDelegate implements ITextHover {
 		return this.delegate;
 	}
 
+	@Deprecated
 	@Override
 	public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
 		if (textViewer instanceof ISourceViewer) {
diff --git a/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeContentAssistProcessor.java b/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeContentAssistProcessor.java
index fece897bd62..f3c9a977551 100644
--- a/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeContentAssistProcessor.java
+++ b/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeContentAssistProcessor.java
@@ -67,18 +67,18 @@ public class CompositeContentAssistProcessor implements IContentAssistProcessor
 			char[] chars = processor.getCompletionProposalAutoActivationCharacters();
 			if (chars != null) {
 				for (char c : chars) {
-					res.add(c);
+					res.add(Character.valueOf(c));
 				}
 			}
 		}
 		return toCharArray(res);
 	}
 
-	private char[] toCharArray(Set<Character> chars) {
+	private static char[] toCharArray(Set<Character> chars) {
 		char[] res = new char[chars.size()];
 		int i = 0;
 		for (Character c : chars) {
-			res[i] = c;
+			res[i] = c.charValue();
 			i++;
 		}
 		return res;
@@ -91,7 +91,7 @@ public class CompositeContentAssistProcessor implements IContentAssistProcessor
 			char[] chars = processor.getContextInformationAutoActivationCharacters();
 			if (chars != null) {
 				for (char c : chars) {
-					res.add(c);
+					res.add(Character.valueOf(c));
 				}
 			}
 		}
@@ -110,9 +110,8 @@ public class CompositeContentAssistProcessor implements IContentAssistProcessor
 		}
 		if (res.length() == 0) {
 			return null;
-		} else {
-			return res.toString();
 		}
+		return res.toString();
 	}
 
 	@Override
diff --git a/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ExtensionBasedTextEditor.java b/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ExtensionBasedTextEditor.java
index bcbf846c5ef..26140d3b646 100644
--- a/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ExtensionBasedTextEditor.java
+++ b/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ExtensionBasedTextEditor.java
@@ -11,7 +11,6 @@
 package org.eclipse.ui.internal.genericeditor;
 
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.IDocument;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.editors.text.TextEditor;
 
diff --git a/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/OrderedExtensionComparator.java b/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/OrderedExtensionComparator.java
index b390daa40a2..9d51ef0c0b5 100644
--- a/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/OrderedExtensionComparator.java
+++ b/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/OrderedExtensionComparator.java
@@ -49,7 +49,7 @@ class OrderedExtensionComparator implements Comparator<TextHoverExtension> {
 		if (before0 == null) {
 			return false;
 		}
-		if ("*".equals(before0)) {
+		if ("*".equals(before0)) { //$NON-NLS-1$
 			return true;
 		}
 		String id1 = arg1.getId();
@@ -71,7 +71,7 @@ class OrderedExtensionComparator implements Comparator<TextHoverExtension> {
 		if (after0 == null) {
 			return false;
 		}
-		if ("*".equals(after0)) {
+		if ("*".equals(after0)) { //$NON-NLS-1$
 			return true;
 		}
 		String id1 = arg1.getId();
-- 
cgit v1.2.3