diff options
author | Lars Vogel | 2014-03-26 10:48:31 +0000 |
---|---|---|
committer | Lars Vogel | 2014-03-26 10:50:56 +0000 |
commit | 534a4ce8282ebf762fb1102ba5acfb21fdd2709a (patch) | |
tree | d0bf77185a44d50c2db86e2ac105cfc663aa2b5f | |
parent | f0639997c1f6a2fab1fa1fc9f4615b8a02b00fdf (diff) | |
download | eclipse.platform.ui-534a4ce8282ebf762fb1102ba5acfb21fdd2709a.tar.gz eclipse.platform.ui-534a4ce8282ebf762fb1102ba5acfb21fdd2709a.tar.xz eclipse.platform.ui-534a4ce8282ebf762fb1102ba5acfb21fdd2709a.zip |
Bug 430873 - Cleanup JFace code in preparation for GSoc
Change-Id: Ica39eaef0bbd6976bdaa967738a0f1716a1703f0
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
3 files changed, 19 insertions, 0 deletions
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractListViewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractListViewer.java index b7a633a2d30..b5f6e7776a4 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractListViewer.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractListViewer.java @@ -462,6 +462,14 @@ public abstract class AbstractListViewer extends StructuredViewer { remove(new Object[] { element }); } + /** + * The list viewer implementation of this <code>Viewer</code> framework + * method ensures that the given label provider is an instance of + * <code>ILabelProvider</code>. + * + * <b>The optional interfaces {@link IColorProvider} and + * {@link IFontProvider} have no effect for this type of viewer</b> + */ @Override public void setLabelProvider(IBaseLabelProvider labelProvider) { Assert.isTrue(labelProvider instanceof ILabelProvider); diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTreeViewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTreeViewer.java index 4f75059fbcb..7acd88c7cc1 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTreeViewer.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTreeViewer.java @@ -1440,6 +1440,12 @@ public abstract class AbstractTreeViewer extends ColumnViewer { return list; } + /* + * Overridden in AbstractTreeViewer to fix bug 108102 (code copied from + * StructuredViewer to avoid introducing new API) (non-Javadoc) + * + * @see org.eclipse.jface.viewers.StructuredViewer#handleDoubleSelect(org.eclipse.swt.events.SelectionEvent) + */ @Override protected void handleDoubleSelect(SelectionEvent event) { // handle case where an earlier selection listener disposed the control. diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StyledString.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StyledString.java index 8b308c374ba..2b5a43aa7a6 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StyledString.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StyledString.java @@ -141,6 +141,11 @@ public class StyledString { return fBuffer.toString(); } + /** + * Returns the string of this {@link StyledString}. + * + * @return the current string of this {@link StyledString}. + */ @Override public String toString() { return getString(); |