diff options
author | Markus Keller | 2015-11-30 19:23:22 +0000 |
---|---|---|
committer | Markus Keller | 2015-12-01 12:59:16 +0000 |
commit | 96da92a20589d62dad534245c5d9c4d45618ee95 (patch) | |
tree | db7f27dc0839db136db463ad28a7e763a6a07a91 /org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink | |
parent | 0bbe21e0e553957dd09eda0b29e8c77a98f38048 (diff) | |
download | eclipse.platform.text-96da92a20589d62dad534245c5d9c4d45618ee95.tar.gz eclipse.platform.text-96da92a20589d62dad534245c5d9c4d45618ee95.tar.xz eclipse.platform.text-96da92a20589d62dad534245c5d9c4d45618ee95.zip |
Bug 478673: generify codeI20151201-1100I20151201-0800
Diffstat (limited to 'org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink')
-rw-r--r-- | org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/AbstractHyperlinkDetector.java | 4 | ||||
-rw-r--r-- | org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/HyperlinkManager.java | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/AbstractHyperlinkDetector.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/AbstractHyperlinkDetector.java index cd73b4f4480..56684a0baf5 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/AbstractHyperlinkDetector.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/AbstractHyperlinkDetector.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 IBM Corporation and others. + * Copyright (c) 2007, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -60,7 +60,7 @@ public abstract class AbstractHyperlinkDetector implements IHyperlinkDetector, I * or <code>null</code> if this object does not * have an adapter for the given class */ - protected final Object getAdapter(Class adapterClass) { + protected final <T> T getAdapter(Class<T> adapterClass) { Assert.isLegal(adapterClass != null); if (fContext != null) return fContext.getAdapter(adapterClass); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/HyperlinkManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/HyperlinkManager.java index 419e4bb0bf2..e38a970cf2d 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/HyperlinkManager.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/HyperlinkManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -267,7 +267,7 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M * @since 3.7 */ private IHyperlink[] findHyperlinks(IRegion region) { - List allHyperlinks= new ArrayList(fHyperlinkDetectors.length * 2); + List<IHyperlink> allHyperlinks= new ArrayList<>(fHyperlinkDetectors.length * 2); synchronized (fHyperlinkDetectors) { for (int i= 0, length= fHyperlinkDetectors.length; i < length; i++) { IHyperlinkDetector detector= fHyperlinkDetectors[i]; @@ -304,18 +304,18 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M if (fDetectionStrategy != ALL) { int maxLength= computeLongestHyperlinkLength(allHyperlinks); - Iterator iter= new ArrayList(allHyperlinks).iterator(); + Iterator<IHyperlink> iter= new ArrayList<>(allHyperlinks).iterator(); while (iter.hasNext()) { - IHyperlink hyperlink= (IHyperlink)iter.next(); + IHyperlink hyperlink= iter.next(); if (hyperlink.getHyperlinkRegion().getLength() < maxLength) allHyperlinks.remove(hyperlink); } } if (fDetectionStrategy == LONGEST_REGION_FIRST) - return new IHyperlink[] {(IHyperlink)allHyperlinks.get(0)}; + return new IHyperlink[] {allHyperlinks.get(0)}; - return (IHyperlink[])allHyperlinks.toArray(new IHyperlink[allHyperlinks.size()]); + return allHyperlinks.toArray(new IHyperlink[allHyperlinks.size()]); } @@ -325,12 +325,12 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M * @param hyperlinks the list of hyperlinks * @return the length of the longest detected */ - protected int computeLongestHyperlinkLength(List hyperlinks) { + protected int computeLongestHyperlinkLength(List<? extends IHyperlink> hyperlinks) { Assert.isLegal(hyperlinks != null && !hyperlinks.isEmpty()); - Iterator iter= hyperlinks.iterator(); + Iterator<? extends IHyperlink> iter= hyperlinks.iterator(); int length= Integer.MIN_VALUE; while (iter.hasNext()) { - IRegion region= ((IHyperlink)iter.next()).getHyperlinkRegion(); + IRegion region= iter.next().getHyperlinkRegion(); if (region.getLength() < length) continue; length= region.getLength(); |