Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2018-03-10 00:50:32 +0000
committerMatthias Sohn2018-03-10 00:50:32 +0000
commitd73aa617a26069771678356deb1ae3101ca9b5df (patch)
tree2a69fe3fb3d9cde47b1bbf0d6cc451bf5cb2b398
parent2c262fb104de93730c267ed26885530538f38a9e (diff)
downloadegit-d73aa617a26069771678356deb1ae3101ca9b5df.tar.gz
egit-d73aa617a26069771678356deb1ae3101ca9b5df.tar.xz
egit-d73aa617a26069771678356deb1ae3101ca9b5df.zip
Remove deprecated UIUtils#applyHyperlinkDetectorStyleRanges
and #getHyperlinkDetectorStyleRanges. Instead of applying SWT styling directly use JFace infrastructure (DefaultDamagerRepairer, ITokenScanner) to do syntax coloring. See also HyperlinkTokenScanner Change-Id: Ibc066c3fdb23afcf4157827f0f279e489487a21c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIUtils.java94
1 files changed, 0 insertions, 94 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIUtils.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIUtils.java
index 98c8f078eb..026885aeed 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIUtils.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIUtils.java
@@ -14,8 +14,6 @@ import java.lang.ref.SoftReference;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
@@ -53,12 +51,6 @@ import org.eclipse.jface.resource.FontRegistry;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.resource.ResourceManager;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
import org.eclipse.jface.viewers.AbstractTreeViewer;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.Viewer;
@@ -67,8 +59,6 @@ import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.KeyEvent;
@@ -85,7 +75,6 @@ import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.ToolBar;
@@ -928,89 +917,6 @@ public class UIUtils {
return showInSubMenu;
}
- /**
- * Use hyperlink detectors to find a text viewer's hyperlinks and apply them
- * to the text widget. Existing overlapping styles are overwritten by new
- * styles from this.
- *
- * @param textViewer
- * @param hyperlinkDetectors
- * @deprecated Instead of applying SWT styling directly use JFace
- * infrastructure (
- * {@link org.eclipse.jface.text.rules.DefaultDamagerRepairer
- * DefaultDamagerRepairer},
- * {@link org.eclipse.jface.text.rules.ITokenScanner
- * ITokenScanner}) to do syntax coloring. See also
- * {@link org.eclipse.egit.ui.internal.dialogs.HyperlinkTokenScanner}
- * .
- */
- @Deprecated
- public static void applyHyperlinkDetectorStyleRanges(
- ITextViewer textViewer, IHyperlinkDetector[] hyperlinkDetectors) {
- StyleRange[] styleRanges = getHyperlinkDetectorStyleRanges(textViewer,
- hyperlinkDetectors);
- StyledText styledText = textViewer.getTextWidget();
- // Apply hyperlink style ranges one by one. setStyleRange takes care to
- // do the right thing in case they overlap with an existing style range.
- for (StyleRange styleRange : styleRanges)
- styledText.setStyleRange(styleRange);
- }
-
- /**
- * Use hyperlink detectors to find a text viewer's hyperlinks and return the
- * style ranges to render them.
- *
- * @param textViewer
- * @param hyperlinkDetectors
- * @return the style ranges to render the detected hyperlinks
- * @deprecated Instead of applying SWT styling directly use JFace
- * infrastructure (
- * {@link org.eclipse.jface.text.rules.DefaultDamagerRepairer
- * DefaultDamagerRepairer},
- * {@link org.eclipse.jface.text.rules.ITokenScanner
- * ITokenScanner}) to do syntax coloring. See also
- * {@link org.eclipse.egit.ui.internal.dialogs.HyperlinkTokenScanner}
- * .
- */
- @Deprecated
- public static StyleRange[] getHyperlinkDetectorStyleRanges(
- ITextViewer textViewer, IHyperlinkDetector[] hyperlinkDetectors) {
- HashSet<StyleRange> styleRangeList = new LinkedHashSet<>();
- if (hyperlinkDetectors != null && hyperlinkDetectors.length > 0) {
- IDocument doc = textViewer.getDocument();
- for (int line = 0; line < doc.getNumberOfLines(); line++) {
- try {
- IRegion region = doc.getLineInformation(line);
- for (IHyperlinkDetector hyperLinkDetector : hyperlinkDetectors) {
- IHyperlink[] hyperlinks = hyperLinkDetector
- .detectHyperlinks(textViewer, region, true);
- if (hyperlinks != null) {
- for (IHyperlink hyperlink : hyperlinks) {
- StyleRange hyperlinkStyleRange = new StyleRange(
- hyperlink.getHyperlinkRegion()
- .getOffset(), hyperlink
- .getHyperlinkRegion()
- .getLength(), Display
- .getDefault().getSystemColor(
- SWT.COLOR_BLUE),
- Display.getDefault().getSystemColor(
- SWT.COLOR_WHITE));
- hyperlinkStyleRange.underline = true;
- styleRangeList.add(hyperlinkStyleRange);
- }
- }
- }
- } catch (BadLocationException e) {
- Activator.logError(e.getMessage(), e);
- break;
- }
- }
- }
- StyleRange[] styleRangeArray = new StyleRange[styleRangeList.size()];
- styleRangeList.toArray(styleRangeArray);
- return styleRangeArray;
- }
-
private static String getShowInMenuLabel() {
IBindingService bindingService = AdapterUtils.adapt(PlatformUI
.getWorkbench(), IBindingService.class);

Back to the top