Attachment #90043 for bug #219393

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 1-5 Link Here

(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/search/NLSSearchResultLabelProvider2.java (-17 / +16 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 15-20 Link Here
15		15
16	import org.eclipse.swt.graphics.Image;	16	import org.eclipse.swt.graphics.Image;
17		17
		18	import org.eclipse.jface.viewers.StyledString;
		19	import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
		20
18	import org.eclipse.search.ui.text.AbstractTextSearchViewPage;	21	import org.eclipse.search.ui.text.AbstractTextSearchViewPage;
19		22
20	import org.eclipse.jdt.ui.JavaElementLabels;	23	import org.eclipse.jdt.ui.JavaElementLabels;
Lines 22-32 Link Here
22	import org.eclipse.jdt.internal.ui.search.TextSearchLabelProvider;	25	import org.eclipse.jdt.internal.ui.search.TextSearchLabelProvider;
23	import org.eclipse.jdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;	26	import org.eclipse.jdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;
24	import org.eclipse.jdt.internal.ui.viewsupport.ColoredJavaElementLabels;	27	import org.eclipse.jdt.internal.ui.viewsupport.ColoredJavaElementLabels;
25	import org.eclipse.jdt.internal.ui.viewsupport.ColoredString;
26	import org.eclipse.jdt.internal.ui.viewsupport.IRichLabelProvider;
27		28
28		29
29	class NLSSearchResultLabelProvider2 extends TextSearchLabelProvider implements IRichLabelProvider {	30	class NLSSearchResultLabelProvider2 extends TextSearchLabelProvider implements IStyledLabelProvider {
30		31
31	private AppearanceAwareLabelProvider fLabelProvider;	32	private AppearanceAwareLabelProvider fLabelProvider;
32		33
Lines 35-57 Link Here
35	fLabelProvider= new AppearanceAwareLabelProvider(JavaElementLabels.ALL_POST_QUALIFIED, 0);	36	fLabelProvider= new AppearanceAwareLabelProvider(JavaElementLabels.ALL_POST_QUALIFIED, 0);
36	}	37	}
37		38
		39	public StyledString getStyledText(Object element) {
		40	return getColoredLabelWithCounts(element, internalGetText(element));
		41	}
		42
		43
38	/* (non-Javadoc)	44	/* (non-Javadoc)
39	* @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)	45	* @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
40	*/	46	*/
41	public String getText(Object element) {	47	public String getText(Object element) {
42	return getLabelWithCounts(element, internalGetText(element).toString());	48	return getLabelWithCounts(element, internalGetText(element).toString());
43	}	49	}
44		50
45	/* (non-Javadoc)	51	private StyledString internalGetText(Object element) {
46	* @see org.eclipse.jdt.internal.ui.viewsupport.IRichLabelProvider#getRichTextLabel(java.lang.Object)
47	*/
48	public ColoredString getRichTextLabel(Object element) {
49	return getColoredLabelWithCounts(element, internalGetText(element));
50	}
51
52	private ColoredString internalGetText(Object element) {
53	String description;	52	String description;
54	ColoredString elementLabel;	53	StyledString elementLabel;
55		54
56	if (element instanceof FileEntry) {	55	if (element instanceof FileEntry) {
57	FileEntry fileEntry= (FileEntry) element;	56	FileEntry fileEntry= (FileEntry) element;
Lines 65-76 Link Here
65	description= NLSSearchMessages.NLSSearchResultLabelProvider2_undefinedKeys;	64	description= NLSSearchMessages.NLSSearchResultLabelProvider2_undefinedKeys;
66	elementLabel= ColoredJavaElementLabels.getTextLabel(element, JavaElementLabels.ALL_POST_QUALIFIED \| ColoredJavaElementLabels.COLORIZE);	65	elementLabel= ColoredJavaElementLabels.getTextLabel(element, JavaElementLabels.ALL_POST_QUALIFIED \| ColoredJavaElementLabels.COLORIZE);
67	}	66	}
68	return new ColoredString(description).append(' ').append(elementLabel);	67	return new StyledString(description).append(' ').append(elementLabel);
69	}	68	}
70		69
71	private ColoredString getPropertiesName(IFile propertiesFile) {	70	private StyledString getPropertiesName(IFile propertiesFile) {
72	String path= propertiesFile.getFullPath().removeLastSegments(1).makeRelative().toString();	71	String path= propertiesFile.getFullPath().removeLastSegments(1).makeRelative().toString();
73	return new ColoredString(propertiesFile.getName()).append(" - " + path, ColoredJavaElementLabels.QUALIFIER_STYLE); //$NON-NLS-1$	72	return new StyledString(propertiesFile.getName()).append(" - " + path, ColoredJavaElementLabels.QUALIFIER_STYLE); //$NON-NLS-1$
74	}	73	}
75		74
76	/*	75	/*




/*******************************************************************************
 * Copyright (c) 2000, 2008 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

import org.eclipse.swt.graphics.Image;

import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.StyledString;

import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.JavaModelException;

import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.JavaPluginImages;
import org.eclipse.jdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;
import org.eclipse.jdt.internal.ui.viewsupport.ColoredString;
import org.eclipse.jdt.internal.ui.viewsupport.ImageDescriptorRegistry;
import org.eclipse.jdt.internal.ui.viewsupport.JavaElementImageProvider;
import org.eclipse.jdt.internal.ui.viewsupport.TreeHierarchyLayoutProblemsDecorator;

	/* (non-Javadoc)
	 * @see org.eclipse.jdt.internal.ui.viewsupport.JavaUILabelProvider#getRichTextLabel(java.lang.Object)
	 */
	public StyledString getStyledText(Object element) {
		if (element instanceof IPackageFragment || element instanceof LogicalPackage)
			return new StyledString(getText(element));
		return super.getStyledText(element);
	}
	

	private String getText(IPackageFragment fragment) {
		if (isFlatView())
			return getFlatText(fragment);




/*******************************************************************************
 * Copyright (c) 2000, 2008 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

import org.eclipse.swt.graphics.Image;

import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.StyledString;

import org.eclipse.ui.IWorkingSet;


import org.eclipse.jdt.ui.JavaElementLabels;

import org.eclipse.jdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;
import org.eclipse.jdt.internal.ui.viewsupport.ColoredString;
import org.eclipse.jdt.internal.ui.viewsupport.JavaElementImageProvider;

/**

	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.jdt.internal.ui.viewsupport.JavaUILabelProvider#getStyledText(java.lang.Object)
	 */
	public StyledString getStyledText(Object element) {
		String text= getSpecificText(element);
		if (text != null) {
			return new StyledString(decorateText(text, element));
		}
		return super.getStyledText(element);
	}
	
	private String getSpecificText(Object element) {




/*******************************************************************************
 * Copyright (c) 2000, 2008 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

import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.LabelProviderChangedEvent;
import org.eclipse.jface.viewers.StyledString;

import org.eclipse.ui.preferences.ScopedPreferenceStore;


import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;
import org.eclipse.jdt.internal.ui.viewsupport.ColoredJavaElementLabels;
import org.eclipse.jdt.internal.ui.viewsupport.ColoredString;

public abstract class SearchLabelProvider extends AppearanceAwareLabelProvider {
	

		return res;
	}
		
	protected final StyledString getColoredLabelWithCounts(Object element, StyledString coloredName) {
		String name= coloredName.getString();
		String decorated= getLabelWithCounts(element, name);
		if (decorated.length() > name.length()) {
			ColoredJavaElementLabels.decorateStyledString(coloredName, decorated, ColoredJavaElementLabels.COUNTER_STYLE);
		}
		return coloredName;
	}

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/search/OccurrencesSearchLabelProvider.java (-14 / +15 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 13-18 Link Here
13		13
14	import org.eclipse.swt.graphics.Image;	14	import org.eclipse.swt.graphics.Image;
15		15
		16	import org.eclipse.jface.viewers.StyledString;
		17	import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
		18	import org.eclipse.jface.viewers.StyledString.Style;
		19
16	import org.eclipse.search.ui.text.AbstractTextSearchViewPage;	20	import org.eclipse.search.ui.text.AbstractTextSearchViewPage;
17	import org.eclipse.search.ui.text.Match;	21	import org.eclipse.search.ui.text.Match;
18		22
Lines 20-30 Link Here
20		24
21	import org.eclipse.jdt.internal.ui.JavaPluginImages;	25	import org.eclipse.jdt.internal.ui.JavaPluginImages;
22	import org.eclipse.jdt.internal.ui.viewsupport.ColoredJavaElementLabels;	26	import org.eclipse.jdt.internal.ui.viewsupport.ColoredJavaElementLabels;
23	import org.eclipse.jdt.internal.ui.viewsupport.ColoredString;
24	import org.eclipse.jdt.internal.ui.viewsupport.IRichLabelProvider;
25	import org.eclipse.jdt.internal.ui.viewsupport.ColoredString.Style;
26		27
27	class OccurrencesSearchLabelProvider extends TextSearchLabelProvider implements IRichLabelProvider {	28	class OccurrencesSearchLabelProvider extends TextSearchLabelProvider implements IStyledLabelProvider {
28		29
29	public OccurrencesSearchLabelProvider(AbstractTextSearchViewPage page) {	30	public OccurrencesSearchLabelProvider(AbstractTextSearchViewPage page) {
30	super(page);	31	super(page);
Lines 37-49 Link Here
37	return getLabelWithCounts(element, internalGetText(element));	38	return getLabelWithCounts(element, internalGetText(element));
38	}	39	}
39		40
40	/* (non-Javadoc)
41	* @see org.eclipse.jdt.internal.ui.viewsupport.IRichLabelProvider#getRichTextLabel(java.lang.Object)
42	*/
43	public ColoredString getRichTextLabel(Object element) {
44	return getColoredLabelWithCounts(element, internalGetRichText(element));
45	}
46
47	private String getLineNumberLabel(JavaElementLine element) {	41	private String getLineNumberLabel(JavaElementLine element) {
48	return Messages.format(SearchMessages.OccurrencesSearchLabelProvider_line_number, new Integer(element.getLine()));	42	return Messages.format(SearchMessages.OccurrencesSearchLabelProvider_line_number, new Integer(element.getLine()));
49	}	43	}
Lines 53-66 Link Here
53	return getLineNumberLabel(jel) + jel.getLineContents();	47	return getLineNumberLabel(jel) + jel.getLineContents();
54	}	48	}
55		49
56	private ColoredString internalGetRichText(Object element) {	50	private StyledString internalGetRichText(Object element) {
57	JavaElementLine jel= (JavaElementLine) element;	51	JavaElementLine jel= (JavaElementLine) element;
58		52
59	String lineNumberString= getLineNumberLabel(jel);	53	String lineNumberString= getLineNumberLabel(jel);
60		54
61	Style highlightStyle= ColoredJavaElementLabels.HIGHLIGHT_STYLE;	55	Style highlightStyle= ColoredJavaElementLabels.HIGHLIGHT_STYLE;
62		56
63	ColoredString res= new ColoredString();	57	StyledString res= new StyledString();
64	res.append(lineNumberString, ColoredJavaElementLabels.QUALIFIER_STYLE);	58	res.append(lineNumberString, ColoredJavaElementLabels.QUALIFIER_STYLE);
65	res.append(jel.getLineContents());	59	res.append(jel.getLineContents());
66	Match[] matches= getPage().getInput().getMatches(jel);	60	Match[] matches= getPage().getInput().getMatches(jel);
Lines 95-98 Link Here
95	}	89	}
96	return JavaPluginImages.get(JavaPluginImages.IMG_OBJS_SEARCH_OCCURRENCE);	90	return JavaPluginImages.get(JavaPluginImages.IMG_OBJS_SEARCH_OCCURRENCE);
97	}	91	}
		92
		93	/* (non-Javadoc)
		94	* @see org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider#getStyledText(java.lang.Object)
		95	*/
		96	public StyledString getStyledText(Object element) {
		97	return getColoredLabelWithCounts(element, internalGetRichText(element));
		98	}
98	}	99	}




/*******************************************************************************
 * Copyright (c) 2000, 2008 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

import org.eclipse.swt.graphics.Image;

import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.StyledString;

import org.eclipse.jdt.core.IClassFile;
import org.eclipse.jdt.core.ICompilationUnit;

import org.eclipse.jdt.ui.JavaElementLabels;

import org.eclipse.jdt.internal.ui.viewsupport.ColoredJavaElementLabels;
import org.eclipse.jdt.internal.ui.viewsupport.ColoredString;

public class PostfixLabelProvider extends SearchLabelProvider {
	private ITreeContentProvider fContentProvider;

	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.jdt.internal.ui.viewsupport.JavaUILabelProvider#getStyledText(java.lang.Object)
	 */
	public StyledString getStyledText(Object element) {
		StyledString StyledString= getColoredLabelWithCounts(element, super.getStyledText(element));
		StyledString.append(getQualification(element), ColoredJavaElementLabels.QUALIFIER_STYLE);
		return StyledString;
	}

}

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/search/SortingLabelProvider.java (-7 / +8 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 14-26 Link Here
14		14
15	import org.eclipse.swt.graphics.Image;	15	import org.eclipse.swt.graphics.Image;
16		16
		17	import org.eclipse.jface.viewers.StyledString;
		18
17	import org.eclipse.jdt.core.IImportDeclaration;	19	import org.eclipse.jdt.core.IImportDeclaration;
18	import org.eclipse.jdt.core.IJavaElement;	20	import org.eclipse.jdt.core.IJavaElement;
19		21
20	import org.eclipse.jdt.ui.JavaElementLabels;	22	import org.eclipse.jdt.ui.JavaElementLabels;
21		23
22	import org.eclipse.jdt.internal.ui.viewsupport.ColoredJavaElementLabels;	24	import org.eclipse.jdt.internal.ui.viewsupport.ColoredJavaElementLabels;
23	import org.eclipse.jdt.internal.ui.viewsupport.ColoredString;
24		25
25	public class SortingLabelProvider extends SearchLabelProvider {	26	public class SortingLabelProvider extends SearchLabelProvider {
26		27
Lines 64-84 Link Here
64	}	65	}
65		66
66	/* (non-Javadoc)	67	/* (non-Javadoc)
67	* @see org.eclipse.jdt.internal.ui.viewsupport.JavaUILabelProvider#getRichTextLabel(java.lang.Object)	68	* @see org.eclipse.jdt.internal.ui.viewsupport.JavaUILabelProvider#getStyledText(java.lang.Object)
68	*/	69	*/
69	public ColoredString getRichTextLabel(Object element) {	70	public StyledString getStyledText(Object element) {
70	if (element instanceof IImportDeclaration)	71	if (element instanceof IImportDeclaration)
71	element= ((IImportDeclaration)element).getParent().getParent();	72	element= ((IImportDeclaration)element).getParent().getParent();
72		73
73	ColoredString text= super.getRichTextLabel(element);	74	StyledString text= super.getStyledText(element);
74	if (text.length() > 0) {	75	if (text.length() > 0) {
75	ColoredString countLabel= getColoredLabelWithCounts(element, text);	76	StyledString countLabel= getColoredLabelWithCounts(element, text);
76	if (fCurrentOrder == SHOW_ELEMENT_CONTAINER) {	77	if (fCurrentOrder == SHOW_ELEMENT_CONTAINER) {
77	countLabel.append(getPostQualification(element), ColoredJavaElementLabels.QUALIFIER_STYLE);	78	countLabel.append(getPostQualification(element), ColoredJavaElementLabels.QUALIFIER_STYLE);
78	}	79	}
79	return countLabel;	80	return countLabel;
80	}	81	}
81	return new ColoredString(getParticipantText(element));	82	return new StyledString(getParticipantText(element));
82	}	83	}
83		84
84	private String getPostQualification(Object element) {	85	private String getPostQualification(Object element) {




/*******************************************************************************
 * Copyright (c) 2000, 2008 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

package org.eclipse.jdt.internal.ui.search;

import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.StyledString;

import org.eclipse.search.ui.text.AbstractTextSearchViewPage;

import org.eclipse.jdt.internal.corext.util.Messages;

import org.eclipse.jdt.internal.ui.viewsupport.ColoredJavaElementLabels;
import org.eclipse.jdt.internal.ui.viewsupport.ColoredString;

public abstract class TextSearchLabelProvider extends LabelProvider {


		return fPage;
	}
			
	protected final StyledString getColoredLabelWithCounts(Object element, StyledString coloredName) {
		String name= coloredName.getString();
		String decorated= getLabelWithCounts(element, name);
		if (decorated.length() > name.length()) {
			ColoredJavaElementLabels.decorateStyledString(coloredName, decorated, ColoredJavaElementLabels.COUNTER_STYLE);
		}
		return coloredName;
	}




            label="%coloredLabels.qualifier.label"
            categoryId="org.eclipse.jdt.ui.presentation"
            value="COLOR_DARK_GRAY"
            id="QUALIFIER_COLOR">
         <description>
            %coloredLabels.qualifier.description
         </description>

            label="%coloredLabels.decorations.label"
            categoryId="org.eclipse.jdt.ui.presentation"
            value="149,125,71"
            id="DECORATIONS_COLOR">
         <description>
            %coloredLabels.decorations.description
         </description>

            label="%coloredLabels.counter.label"
            categoryId="org.eclipse.jdt.ui.presentation"
            value="0,127,174"
            id="COUNTER_COLOR">
         <description>
            %coloredLabels.counter.description
         </description>




/*******************************************************************************
 * Copyright (c) 2007 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.internal.ui.viewsupport;

import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyleRange;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.graphics.TextLayout;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Item;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.TreeItem;

import org.eclipse.jface.window.Window;

/**
 * Adding owner draw support to a control
 */
public abstract class OwnerDrawSupport implements Listener {
	
	private TextLayout fTextLayout;
	private final Control fControl;
	
	public OwnerDrawSupport(Control control) {
		fControl= control;
		fTextLayout= new TextLayout(control.getDisplay());
		fTextLayout.setOrientation(Window.getDefaultOrientation());
		
		control.addListener(SWT.PaintItem, this);
		control.addListener(SWT.EraseItem, this);
		control.addListener(SWT.Dispose, this);
	}
	
	/**
	 * Return the colored label for the given item.
	 * @param item the item to return the colored label for
	 * @return the colored string
	 */
	public abstract ColoredString getColoredLabel(Item item);
	
	/**
	 * Return the color for the given style
	 * @param colorName the name of the color
	 * @param display the current display
	 * @return the color
	 */
	public abstract Color getColor(String colorName, Display display);
	
	/* (non-Javadoc)
	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
	 */
	public void handleEvent(Event event) {
		if (event.type == SWT.PaintItem) {
			performPaint(event);
		} else if (event.type == SWT.EraseItem) {
			performErase(event);
		} else if (event.type == SWT.Dispose) {
			dispose();
		}
	}
	
	private void performErase(Event event) {
		event.detail &= ~SWT.FOREGROUND;
	}
			
	private void performPaint(Event event) {
		Item item= (Item) event.item;
		GC gc= event.gc;

		ColoredString coloredLabel= getColoredLabel(item);
		boolean isSelected= (event.detail & SWT.SELECTED) != 0;
		if (item instanceof TreeItem) {
			TreeItem treeItem= (TreeItem) item;
			Image image = treeItem.getImage(event.index);
			if (image != null) {
				processImage(image, gc, treeItem.getImageBounds(event.index));
			}
			Rectangle textBounds= treeItem.getTextBounds(event.index);
			Font font= treeItem.getFont(event.index);
			processColoredLabel(coloredLabel, gc, textBounds, isSelected, font);
			
			Rectangle bounds= treeItem.getBounds();
			if ((event.detail & SWT.FOCUSED) != 0) {
				gc.drawFocus(bounds.x, bounds.y, bounds.width, bounds.height);
			}
		} else if (item instanceof TableItem) {
			TableItem tableItem= (TableItem) item;		
			Image image = tableItem.getImage(event.index);
			if (image != null) {
				processImage(image, gc, tableItem.getImageBounds(event.index));
			}
			Rectangle textBounds= tableItem.getTextBounds(event.index);
			Font font= tableItem.getFont(event.index);
			processColoredLabel(coloredLabel, gc, textBounds, isSelected, font);
			
			Rectangle bounds= tableItem.getBounds();
			if ((event.detail & SWT.FOCUSED) != 0) {
				gc.drawFocus(bounds.x, bounds.y, bounds.width, bounds.height);
			}
		}
	}
	
	private void processImage(Image image, GC gc, Rectangle imageBounds) {
		Rectangle bounds= image.getBounds();
		int x= imageBounds.x + Math.max(0, (imageBounds.width - bounds.width) / 2);
		int y= imageBounds.y + Math.max(0, (imageBounds.height - bounds.height) / 2);
		gc.drawImage(image, x, y);
	}
	
	private void processColoredLabel(ColoredString richLabel, GC gc, Rectangle textBounds, boolean isSelected, Font font) {
		String text= richLabel.getString();
		fTextLayout.setText(text);
		fTextLayout.setFont(font);
		
		// apply the styled ranges only when element is not selected
		StyleRange[] styleRanges= richLabel.getStyleRanges();
		for (int i= 0; i < styleRanges.length; i++) {
			StyleRange styleRange= styleRanges[i];
			if (isSelected) {
				styleRange.foreground= null;
				styleRange.background= null;
			}
			fTextLayout.setStyle(styleRange, styleRange.start, styleRange.start + styleRange.length - 1);
		}
		
		Rectangle bounds= fTextLayout.getBounds();
		int x= textBounds.x;
		int y = textBounds.y + Math.max(0, (textBounds.height - bounds.height) / 2);
		
		fTextLayout.draw(gc, x, y);
		fTextLayout.setText(""); // clear all ranges //$NON-NLS-1$
	}
	
	public void dispose() {
		if (fTextLayout != null) {
			fTextLayout.dispose();
			fTextLayout= null;
		}
		if (!fControl.isDisposed()) {
			fControl.removeListener(SWT.PaintItem, this);
			fControl.removeListener(SWT.EraseItem, this);
			fControl.removeListener(SWT.Dispose, this);
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2000, 2007 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.internal.ui.viewsupport;

import org.eclipse.jface.viewers.ILabelProvider;

public interface IRichLabelProvider extends ILabelProvider {
	
	ColoredString getRichTextLabel(Object object);

}




/*******************************************************************************
 * Copyright (c) 2000, 2008 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

import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;

import org.eclipse.jface.viewers.StyledString;
import org.eclipse.jface.viewers.StyledString.Style;
import org.eclipse.jface.resource.ColorRegistry;
import org.eclipse.jface.resource.JFaceResources;

import org.eclipse.ui.model.IWorkbenchAdapter;


import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.JavaUIMessages;
import org.eclipse.jdt.internal.ui.packageview.ClassPathContainer;
import org.eclipse.jdt.internal.ui.viewsupport.ColoredString.Style;

public class ColoredJavaElementLabels {
	
	public static class DefaultStyle extends Style {
		private final String fForegroundColorName;
		private final String fBackgroundColorName;

		public DefaultStyle(String foregroundColorName, String backgroundColorName) {
			fForegroundColorName= foregroundColorName;	
			fBackgroundColorName= backgroundColorName;
		}
		
		public void applyStyles(TextStyle textStyle) {
			ColorRegistry colorRegistry= JFaceResources.getColorRegistry();
			if (fForegroundColorName != null) {
				textStyle.foreground= colorRegistry.get(fForegroundColorName);
			}
			if (fBackgroundColorName != null) {
				textStyle.background= colorRegistry.get(fBackgroundColorName);
			}
		}
	}


	public static final Style QUALIFIER_STYLE= StyledString.QUALIFIER_STYLE; 
	public static final Style COUNTER_STYLE= StyledString.COUNTER_STYLE; 
	public static final Style DECORATIONS_STYLE= StyledString.DECORATIONS_STYLE; 
	
	public static final Style HIGHLIGHT_STYLE= StyledString.createColorRegistryStyle(null, ColoredViewersManager.HIGHLIGHT_BG_COLOR_NAME);
	public static final Style HIGHLIGHT_WRITE_STYLE= StyledString.createColorRegistryStyle(null, ColoredViewersManager.HIGHLIGHT_WRITE_BG_COLOR_NAME);
	
	private static final Style APPENDED_TYPE_STYLE= DECORATIONS_STYLE; 
	

	 * @param flags The rendering flags
	 * @return Returns the label or the empty string if the object type is not supported.
	 */
	public static StyledString getTextLabel(Object obj, long flags) {
		if (obj instanceof IJavaElement) {
			return getElementLabel((IJavaElement) obj, flags);
		} else if (obj instanceof IResource) {
			return new StyledString(((IResource) obj).getName());
		} else if (obj instanceof ClassPathContainer) {
			ClassPathContainer container= (ClassPathContainer) obj;
			return getContainerEntryLabel(container.getClasspathEntry().getPath(), container.getJavaProject());
		}
		return new StyledString(JavaElementLabels.getTextLabel(obj, flags));
	}
				
	/**

	 * @param flags The rendering flags.
	 * @return the label of the Java element
	 */
	public static StyledString getElementLabel(IJavaElement element, long flags) {
		StyledString result= new StyledString();
		getElementLabel(element, flags, result);
		return result;
	}

	 * @param flags The rendering flags.
	 * @param result The buffer to append the resulting label to.
	 */
	public static void getElementLabel(IJavaElement element, long flags, StyledString result) {
		int type= element.getElementType();
		IPackageFragmentRoot root= null;
		

	}

	/**
	 * Appends the label for a method to a {@link StyledString}. Considers the M_* flags.
	 * 	@param method The element to render.
	 * @param flags The rendering flags. Flags with names starting with 'M_' are considered.
	 * @param result The buffer to append the resulting label to.
	 */		
	public static void getMethodLabel(IMethod method, long flags, StyledString result) {
		try {
			BindingKey resolvedKey= getFlag(flags, JavaElementLabels.USE_RESOLVED) && method.isResolved() ? new BindingKey(method.getKey()) : null;
			String resolvedSig= (resolvedKey != null) ? resolvedKey.toSignature() : null;

		}
	}

	private static void getCategoryLabel(IMember member, long flags, StyledString result) throws JavaModelException {
		String[] categories= member.getCategories();
		if (categories.length > 0) {
			int offset= result.length();
			StyledString categoriesBuf= new StyledString();
			for (int i= 0; i < categories.length; i++) {
				if (i > 0)
					categoriesBuf.append(JavaUIMessages.JavaElementLabels_category_separator_string);

	 * @param flags flags with render options
	 * @param result the resulting string buffer
	 */
	private static void getTypeParametersLabel(ITypeParameter[] typeParameters, long flags, StyledString result) {
		if (typeParameters.length > 0) {
			result.append('<');
			for (int i = 0; i < typeParameters.length; i++) {

	}
	
	/**
	 * Appends the label for a field to a {@link StyledString}. Considers the F_* flags.
	 * 	@param field The element to render.
	 * @param flags The rendering flags. Flags with names starting with 'F_' are considered.
	 * @param result The buffer to append the resulting label to.
	 */	
	public static void getFieldLabel(IField field, long flags, StyledString result) {
		try {
			
			if (getFlag(flags, JavaElementLabels.F_PRE_TYPE_SIGNATURE) && field.exists() && !Flags.isEnum(field.getFlags())) {

	}
	
	/**
	 * Appends the label for a local variable to a {@link StyledString}.
	 * 	@param localVariable The element to render.
	 * @param flags The rendering flags. Flags with names starting with 'F_' are considered.
	 * @param result The buffer to append the resulting label to.
	 */	
	public static void getLocalVariableLabel(ILocalVariable localVariable, long flags, StyledString result) {
		if (getFlag(flags, JavaElementLabels.F_PRE_TYPE_SIGNATURE)) {
			getTypeSignatureLabel(localVariable.getTypeSignature(), flags, result);
			result.append(' ');

	}
	
	/**
	 * Appends the label for a initializer to a {@link StyledString}. Considers the I_* flags.
	 * 	@param initializer The element to render.
	 * @param flags The rendering flags. Flags with names starting with 'I_' are considered.
	 * @param result The buffer to append the resulting label to.
	 */	
	public static void getInitializerLabel(IInitializer initializer, long flags, StyledString result) {
		// qualification
		if (getFlag(flags, JavaElementLabels.I_FULLY_QUALIFIED)) {
			getTypeLabel(initializer.getDeclaringType(), JavaElementLabels.T_FULLY_QUALIFIED | (flags & QUALIFIER_FLAGS), result);

		}
	}
	
	private static void getTypeSignatureLabel(String typeSig, long flags, StyledString result) {
		int sigKind= Signature.getTypeSignatureKind(typeSig);
		switch (sigKind) {
			case Signature.BASE_TYPE_SIGNATURE:

		}
	}
	
	private static void getTypeArgumentSignaturesLabel(String[] typeArgsSig, long flags, StyledString result) {
		if (typeArgsSig.length > 0) {
			result.append('<');
			for (int i = 0; i < typeArgsSig.length; i++) {

	 * @param flags flags with render options
	 * @param result the resulting string buffer
	 */
	private static void getTypeParameterSignaturesLabel(String[] typeParamSigs, long flags, StyledString result) {
		if (typeParamSigs.length > 0) {
			result.append('<');
			for (int i = 0; i < typeParamSigs.length; i++) {

	

	/**
	 * Appends the label for a type to a {@link StyledString}. Considers the T_* flags.
	 * 	@param type The element to render.
	 * @param flags The rendering flags. Flags with names starting with 'T_' are considered.
	 * @param result The buffer to append the resulting label to.
	 */		
	public static void getTypeLabel(IType type, long flags, StyledString result) {
		
		if (getFlag(flags, JavaElementLabels.T_FULLY_QUALIFIED)) {
			IPackageFragment pack= type.getPackageFragment();

	}

	/**
	 * Appends the label for a import container, import or package declaration to a {@link StyledString}. Considers the D_* flags.
	 * 	@param declaration The element to render.
	 * @param flags The rendering flags. Flags with names starting with 'D_' are considered.
	 * @param result The buffer to append the resulting label to.
	 */	
	public static void getDeclarationLabel(IJavaElement declaration, long flags, StyledString result) {
		if (getFlag(flags, JavaElementLabels.D_QUALIFIED)) {
			IJavaElement openable= (IJavaElement) declaration.getOpenable();
			if (openable != null) {

	}	
	
	/**
	 * Appends the label for a class file to a {@link StyledString}. Considers the CF_* flags.
	 * 	@param classFile The element to render.
	 * @param flags The rendering flags. Flags with names starting with 'CF_' are considered.
	 * @param result The buffer to append the resulting label to.
	 */	
	public static void getClassFileLabel(IClassFile classFile, long flags, StyledString result) {
		if (getFlag(flags, JavaElementLabels.CF_QUALIFIED)) {
			IPackageFragment pack= (IPackageFragment) classFile.getParent();
			if (!pack.isDefaultPackage()) {

	}

	/**
	 * Appends the label for a compilation unit to a {@link StyledString}. Considers the CU_* flags.
	 * 	@param cu The element to render.
	 * @param flags The rendering flags. Flags with names starting with 'CU_' are considered.
	 * @param result The buffer to append the resulting label to.
	 */
	public static void getCompilationUnitLabel(ICompilationUnit cu, long flags, StyledString result) {
		if (getFlag(flags, JavaElementLabels.CU_QUALIFIED)) {
			IPackageFragment pack= (IPackageFragment) cu.getParent();
			if (!pack.isDefaultPackage()) {

	}

	/**
	 * Appends the label for a package fragment to a {@link StyledString}. Considers the P_* flags.
	 * 	@param pack The element to render.
	 * @param flags The rendering flags. Flags with names starting with P_' are considered.
	 * @param result The buffer to append the resulting label to.
	 */	
	public static void getPackageFragmentLabel(IPackageFragment pack, long flags, StyledString result) {
		if (getFlag(flags, JavaElementLabels.P_QUALIFIED)) {
			getPackageFragmentRootLabel((IPackageFragmentRoot) pack.getParent(), JavaElementLabels.ROOT_QUALIFIED, result);
			result.append('/');

	}

	/**
	 * Appends the label for a package fragment root to a {@link StyledString}. Considers the ROOT_* flags.
	 * 	@param root The element to render.
	 * @param flags The rendering flags. Flags with names starting with ROOT_' are considered.
	 * @param result The buffer to append the resulting label to.
	 */	
	public static void getPackageFragmentRootLabel(IPackageFragmentRoot root, long flags, StyledString result) {
		if (root.isArchive())
			getArchiveLabel(root, flags, result);
		else
			getFolderLabel(root, flags, result);
	}
	
	private static void getArchiveLabel(IPackageFragmentRoot root, long flags, StyledString result) {
		// Handle variables different	
		if (getFlag(flags, JavaElementLabels.ROOT_VARIABLE) && getVariableLabel(root, flags, result))
			return;

			getInternalArchiveLabel(root, flags, result);
	}
	
	private static boolean getVariableLabel(IPackageFragmentRoot root, long flags, StyledString result) {
		try {
			IClasspathEntry rawEntry= root.getRawClasspathEntry();
			if (rawEntry != null && rawEntry.getEntryKind() == IClasspathEntry.CPE_VARIABLE) {

		return false;
	}

	private static void getExternalArchiveLabel(IPackageFragmentRoot root, long flags, StyledString result) {
		IPath path= root.getPath();
		if (getFlag(flags, JavaElementLabels.REFERENCED_ROOT_POST_QUALIFIED)) {
			int segements= path.segmentCount();

		}
	}

	private static void getInternalArchiveLabel(IPackageFragmentRoot root, long flags, StyledString result) {
		IResource resource= root.getResource();
		boolean rootQualified= getFlag(flags, JavaElementLabels.ROOT_QUALIFIED);
		boolean referencedQualified= getFlag(flags, JavaElementLabels.REFERENCED_ROOT_POST_QUALIFIED) && isReferenced(root);

		}
	}

	private static void getFolderLabel(IPackageFragmentRoot root, long flags, StyledString result) {
		IResource resource= root.getResource();
		boolean rootQualified= getFlag(flags, JavaElementLabels.ROOT_QUALIFIED);
		boolean referencedQualified= getFlag(flags, JavaElementLabels.REFERENCED_ROOT_POST_QUALIFIED) && isReferenced(root);

	 * @param project The project the container is resolved in.
	 * @return Returns the label of the classpath container
	 */
	public static StyledString getContainerEntryLabel(IPath containerPath, IJavaProject project) {
		try {
			IClasspathContainer container= JavaCore.getClasspathContainer(containerPath, project);
			String description= null;

				}
			}
			if (description != null) {
				StyledString str= new StyledString(description);
				if (containerPath.segmentCount() > 0 && JavaRuntime.JRE_CONTAINER.equals(containerPath.segment(0))) {
					int index= description.indexOf('[');
					if (index != -1) {

		} catch (JavaModelException e) {
			// ignore
		}
		return new StyledString(containerPath.toString());
	}

	public static StyledString decorateStyledString(StyledString string, String decorated, Style color) {
		String label= string.getString();
		int originalStart= decorated.indexOf(label);
		if (originalStart == -1) {
			return new StyledString(decorated); // the decorator did something wild
		}
		if (originalStart > 0) {
			StyledString newString= new StyledString(decorated.substring(0, originalStart), color);
			newString.append(string);
			string= newString;
		}

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/viewsupport/DecoratingJavaLabelProvider.java (-23 / +21 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 15-20 Link Here
15	import org.eclipse.jface.viewers.ILabelDecorator;	15	import org.eclipse.jface.viewers.ILabelDecorator;
16	import org.eclipse.jface.viewers.ILabelProvider;	16	import org.eclipse.jface.viewers.ILabelProvider;
17	import org.eclipse.jface.viewers.LabelDecorator;	17	import org.eclipse.jface.viewers.LabelDecorator;
		18	import org.eclipse.jface.viewers.StyledString;
		19	import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
18		20
19	import org.eclipse.ui.PlatformUI;	21	import org.eclipse.ui.PlatformUI;
20		22
Lines 22-28 Link Here
22		24
23	import org.eclipse.jdt.internal.ui.packageview.HierarchicalDecorationContext;	25	import org.eclipse.jdt.internal.ui.packageview.HierarchicalDecorationContext;
24		26
25	public class DecoratingJavaLabelProvider extends DecoratingLabelProvider implements IRichLabelProvider {	27	public class DecoratingJavaLabelProvider extends DecoratingLabelProvider implements IStyledLabelProvider {
26		28
27	/**	29	/**
28	* Decorating label provider for Java. Combines a JavaUILabelProvider	30	* Decorating label provider for Java. Combines a JavaUILabelProvider
Lines 74-104 Link Here
74	}	76	}
75		77
76	/* (non-Javadoc)	78	/* (non-Javadoc)
77	* @see org.eclipse.jdt.internal.ui.viewsupport.IRichLabelProvider#getRichTextLabel(Object)	79	* @see org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider#getStyledText(java.lang.Object)
78	*/	80	*/
79	public ColoredString getRichTextLabel(Object element) {	81	public StyledString getStyledText(Object element) {
		82
80	ILabelProvider labelProvider= getLabelProvider();	83	ILabelProvider labelProvider= getLabelProvider();
81	if (labelProvider instanceof IRichLabelProvider) {	84	if (labelProvider instanceof IStyledLabelProvider) {
82	// get a rich label from the label decorator	85	StyledString styledString= ((IStyledLabelProvider) labelProvider).getStyledText(element);
83	IRichLabelProvider richLabelProvider= (IRichLabelProvider) labelProvider;	86
84	ColoredString richLabel= richLabelProvider.getRichTextLabel(element);	87	String decorated= null;
85	if (richLabel != null) {	88	ILabelDecorator labelDecorator= getLabelDecorator();
86	String decorated= null;	89	if (labelDecorator != null) {
87	ILabelDecorator labelDecorator= getLabelDecorator();	90	if (labelDecorator instanceof LabelDecorator) {
88	if (labelDecorator != null) {	91	decorated= ((LabelDecorator) labelDecorator).decorateText(styledString.getString(), element, getDecorationContext());
89	if (labelDecorator instanceof LabelDecorator) {	92	} else {
90	decorated= ((LabelDecorator) labelDecorator).decorateText(richLabel.getString(), element, getDecorationContext());	93	decorated= labelDecorator.decorateText(styledString.getString(), element);
91	} else {
92	decorated= labelDecorator.decorateText(richLabel.getString(), element);
93	}
94	}	94	}
95	if (decorated != null) {	95	}
96	return ColoredJavaElementLabels.decorateColoredString(richLabel, decorated, ColoredJavaElementLabels.DECORATIONS_STYLE);	96	if (decorated != null) {
97	}	97	return ColoredJavaElementLabels.decorateStyledString(styledString, decorated, ColoredJavaElementLabels.DECORATIONS_STYLE);
98	return richLabel;
99	}	98	}
100	}	99	}
101	return null;	100	return new StyledString(getText(element));
102	}	101	}
103
104	}	102	}




/*******************************************************************************
 * Copyright (c) 2000, 2008 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

 *******************************************************************************/
package org.eclipse.jdt.internal.ui.viewsupport;

import org.eclipse.swt.custom.StyleRange;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;

import org.eclipse.jface.resource.ColorRegistry;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.ColumnViewer;
import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
import org.eclipse.jface.viewers.IFontProvider;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.SimpleStyledCellLabelProvider;
import org.eclipse.jface.viewers.ViewerColumn;

public class ColoringLabelProvider extends DelegatingStyledCellLabelProvider implements ILabelProvider {
		
	public ColoringLabelProvider(IStyledLabelProvider labelProvider) {
		super(labelProvider);
	
	public ColoringLabelProvider(ILabelProvider labelProvider) {
		fLabelProvider= labelProvider;
		fRegistry= JFaceResources.getColorRegistry();
	}
	
	public void initialize(ColumnViewer viewer, ViewerColumn column) {

		
		super.initialize(viewer, column);
	}
		
	public void addListener(ILabelProviderListener listener) {
		super.addListener(listener);
		fLabelProvider.addListener(listener);
	}
	
	public void removeListener(ILabelProviderListener listener) {
		super.removeListener(listener);
		fLabelProvider.removeListener(listener);
	}
	
	public void dispose() {
		super.dispose();
		ColoredViewersManager.uninstall(this);

		}
	}
	
	protected LabelPresentationInfo getLabelPresentationInfo(Object element) {
		Image image= fLabelProvider.getImage(element);
		Font defaultFont= null;
		
		if (fLabelProvider instanceof IFontProvider) {
			IFontProvider fontProvider= (IFontProvider) fLabelProvider;
			defaultFont= fontProvider.getFont(element);
		}
		Color foreground= null;
		Color background= null;
		if (fLabelProvider instanceof IColorProvider) {
			IColorProvider colorProvider= (IColorProvider) fLabelProvider;
			foreground= colorProvider.getForeground(element);
			background= colorProvider.getBackground(element);
		}
		String text;
		StyleRange[] ranges;
		ColoredString label= getRichTextLabel(element);
		if (label != null) {
			text= label.getString();
			ranges= label.getStyleRanges();
		} else {
			text= fLabelProvider.getText(element);
			ranges= new StyleRange[0];
		}
		return new LabelPresentationInfo(text, ranges, image, defaultFont, foreground, background);
	}
	
	
	private ColoredString getRichTextLabel(Object element) {
		if (fLabelProvider instanceof IRichLabelProvider) {
			// get a rich label 
			IRichLabelProvider richLabelProvider= (IRichLabelProvider) fLabelProvider;
			ColoredString richLabel= richLabelProvider.getRichTextLabel(element);
			if (richLabel != null) {
				return richLabel;
			}
		}
		return null;
	}

	public Image getImage(Object element) {
		return getStyledStringProvider().getImage(element);
	}

	public String getText(Object element) {
		return getStyledStringProvider().getStyledText(element).getString();
	}

}




/*******************************************************************************
 * Copyright (c) 2000, 2008 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


import org.eclipse.swt.widgets.Display;

import org.eclipse.jface.preference.JFacePreferences;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;

	 */
	public static final String PREF_COLORED_LABELS= "colored_labels_in_views"; //$NON-NLS-1$
	
	public static final String QUALIFIER_COLOR_NAME= JFacePreferences.QUALIFIER_COLOR;
	public static final String DECORATIONS_COLOR_NAME= JFacePreferences.DECORATIONS_COLOR;
	public static final String COUNTER_COLOR_NAME= JFacePreferences.COUNTER_COLOR;
	
	public static final String INHERITED_COLOR_NAME= "org.eclipse.jdt.ui.ColoredLabels.inherited"; //$NON-NLS-1$
	
	public static final String HIGHLIGHT_BG_COLOR_NAME= "org.eclipse.jdt.ui.ColoredLabels.match_highlight"; //$NON-NLS-1$

	private static ColoredViewersManager fgInstance= new ColoredViewersManager();
	
	private Set fManagedLabelProviders;
		
	private ColorRegistry fColorRegisty;
	
	public ColoredViewersManager() {
		fManagedLabelProviders= new HashSet();
		fColorRegisty= JFaceResources.getColorRegistry();
	}
	
	public void installColoredLabels(ColoringLabelProvider labelProvider) {

		if (fManagedLabelProviders.isEmpty()) {
			// first lp installed
			PreferenceConstants.getPreferenceStore().addPropertyChangeListener(this);
			JFaceResources.getColorRegistry().addListener(this);
		}
		fManagedLabelProviders.add(labelProvider);
	}

		
		if (fManagedLabelProviders.isEmpty()) {
			PreferenceConstants.getPreferenceStore().removePropertyChangeListener(this);
			JFaceResources.getColorRegistry().removeListener(this);
			// last viewer uninstalled
		}
	}




/*******************************************************************************
 * Copyright (c) 2000, 2008 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.internal.ui.viewsupport;

import java.util.ArrayList;
import java.util.List;

import org.eclipse.swt.custom.StyleRange;
import org.eclipse.swt.graphics.TextStyle;

/**
 * Represents a string with styled ranges. All ranges mark substrings of the string and do not overlap.
 * Styles are represented by {@link Style}.
 * 
 * The styled string can be modified:
 * <ul>
 * <li>new strings with styles can be appended</li>
 * <li>styles can by applied to to the existing string</li>
 * </ul>
 * 
 * <p>
 * This class may be instantiated; it is not intended to be subclassed.
 * </p>
 *  
 */
public class ColoredString {
	
	/**
	 * Represents a style that can be associated to one ore more ranges in the {@link ColoredString}
	 *  
	 */
	public static abstract class Style {
		
		/**
		 * Applies the styles represented by this object to the given textStyle.
		 * 
		 * @param textStyle the {@link TextStyle} to modify
		 */
		public abstract void applyStyles(TextStyle textStyle);
	}
	
	private static final StyleRange[] EMPTY= new StyleRange[0];
	
	private StringBuffer fBuffer;
	private StyleRunList fStyleRuns;
	
	/**
	 * Creates an empty {@link ColoredString}.
	 */
	public ColoredString() {
		fBuffer= new StringBuffer();
		fStyleRuns= null;
	}
	
	/**
	 * Creates an {@link ColoredString} initialized with a string without a style associated.
	 * 
	 * @param string the string 
	 */
	public ColoredString(String string) {
		this(string, null);
	}
	
	/**
	 * Creates an {@link ColoredString} initialized with a string and a style.  
	 * 
	 * @param string the string 
	 * @param style the style of the text or <code>null</code> to not associated a style.
	 */
	public ColoredString(String string, Style style) {
		this();
		append(string, style);
	}
	
	/**
	 * Returns the string of this {@link ColoredString}.
	 * 
	 * @return the current string of this {@link ColoredString}.
	 */
	public String getString() {
		return fBuffer.toString();
	}
	
	/**
	 * Returns the length of the string of this {@link ColoredString}.
	 * 
	 * @return the length of the current string
	 */
	public int length() {
		return fBuffer.length();
	}
	
	/**
	 * Appends a string to the {@link ColoredString}. The appended string will have no style associated.
	 * 
	 * @param string the string to append.
	 * @return returns a reference to this object.
	 */
	public ColoredString append(String string) {
		return append(string, null);
	}
	
	/**
	 * Appends a character to the {@link ColoredString}. The appended character will have no style associated.
	 * 
	 * @param ch the character to append.
	 * @return returns a reference to this object.
	 */
	public ColoredString append(char ch) {
		return append(String.valueOf(ch), null);
	}
	
	/**
	 * Appends a string with styles to the {@link ColoredString}.
	 * 
	 * @param string the string to append.
	 * @return returns a reference to this object.
	 */
	public ColoredString append(ColoredString string) {
		if (string.length() == 0) {
			return this;
		}
		
		int offset= fBuffer.length();
		fBuffer.append(string.getString());
		
		List otherRuns= string.fStyleRuns;
		if (otherRuns != null && !otherRuns.isEmpty()) {
			for (int i= 0; i < otherRuns.size(); i++) {
				StyleRun curr= (StyleRun) otherRuns.get(i);
				if (i == 0 && curr.offset != 0) {
					appendStyleRun(null, offset); // appended string will start with the default color
				}
				appendStyleRun(curr.style, offset + curr.offset);
			}
		} else {
			appendStyleRun(null, offset); // appended string will start with the default color
		}
		return this;
	}
	
	/**
	 * Appends a character with a style to the {@link ColoredString}. The appended character will
	 * have the given style associated.
	 * 
	 * @param ch the character to append.
	 * @param style the style to of the character to append or <code>null</code> if no style should be
	 * associated to the string.
	 * @return returns a reference to this object.
	 */
	public ColoredString append(char ch, Style style) {
		return append(String.valueOf(ch), style);
	}
	
	/**
	 * Appends a string with a style to the {@link ColoredString}. The appended string will
	 * have the given style associated.
	 * 
	 * @param string the string to append.
	 * @param style the style to of the string to append or <code>null</code> if no style should be
	 * associated to the string.
	 * @return returns a reference to this object.
	 */
	public ColoredString append(String string, Style style) {
		if (string.length() == 0)
			return this;
		
		int offset= fBuffer.length(); // the length before appending
		fBuffer.append(string);
		appendStyleRun(style, offset);
		return this;
	}
	
	/**
	 * Sets a style to the given source range. The range must be subrange of actual string of this {@link ColoredString}.
	 * Styles previously set for that range will be overwritten.
	 * 
	 * @param offset the start offset of the range
	 * @param length the length of the range
	 * @param style the style to set
	 * 
	 * @throws StringIndexOutOfBoundsException if <code>start</code> is
     *             less than zero, or if offset plus length is greater than the length of this object.
	 */
	public void setStyle(int offset, int length, Style style) {
		if (offset < 0 || offset + length > fBuffer.length()) {
			throw new StringIndexOutOfBoundsException("Invalid offset (" + offset + ") or length (" + length + ")");   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
		}
		if (length == 0) {
			return;
		}
		if (!hasRuns() || getLastRun().offset <= offset) {
			appendStyleRun(style, offset);
			if (offset + length != fBuffer.length()) {
				appendStyleRun(null, offset + length);
			}
			return;
		}
		
		int endRun= findRun(offset + length);
		if (endRun >= 0) {
			// run with the same end index, nothing to change
		} else {
			endRun= -(endRun + 1);
			if (offset + length < fBuffer.length()) {
				Style prevStyle= endRun > 0 ? fStyleRuns.getRun(endRun - 1).style : null;
				fStyleRuns.add(endRun, new StyleRun(offset + length, prevStyle));
			}
		}
		
		int startRun= findRun(offset);
		if (startRun >= 0) {
			// run with the same start index
			StyleRun styleRun= fStyleRuns.getRun(startRun);
			styleRun.style= style;
		} else {
			startRun= -(startRun + 1);
			
			Style prevStyle= startRun > 0 ? fStyleRuns.getRun(startRun - 1).style : null;
			if (isDifferentStyle(prevStyle, style) || (startRun == 0 && style != null)) {
				fStyleRuns.add(startRun, new StyleRun(offset, style));
				endRun++; // endrun is moved one back
			} else {
				startRun--; // we use the previous
			}
		}
		if (startRun + 1 < endRun) {
			fStyleRuns.removeRange(startRun + 1, endRun);
		}
	}
	
	/**
	 * Returns {@link StyleRange} for all applied styles to this string
	 * 
	 * @return an array of all {@link StyleRange} applied to this string.
	 */
	public StyleRange[] getStyleRanges() {
		if (hasRuns()) {
			ArrayList res= new ArrayList();
			
			List styleRuns= getStyleRuns();
			int offset= 0;
			Style style= null;
			for (int i= 0; i < styleRuns.size(); i++) {
				StyleRun curr= (StyleRun) styleRuns.get(i);
				if (isDifferentStyle(curr.style, style)) {
					if (curr.offset > offset && style != null) {
						res.add(createStyleRange(offset, curr.offset, style));
					}
					offset= curr.offset;
					style= curr.style;
				}
			}
			if (fBuffer.length() > offset && style != null) {
				res.add(createStyleRange(offset, fBuffer.length(), style));
			}
			return (StyleRange[]) res.toArray(new StyleRange[res.size()]);
		}
		return EMPTY;
	}
	
	private int findRun(int offset) {
		// method assumes that fStyleRuns is not null
		int low= 0;
		int high= fStyleRuns.size() - 1;
		while (low <= high) {
		    int mid = (low + high) / 2;
		    StyleRun styleRun= fStyleRuns.getRun(mid);
		    if (styleRun.offset < offset) {
		    	low = mid + 1;
		    } else if (styleRun.offset > offset) {
		    	high = mid - 1;
		    } else {
		    	return mid; // key found
		    }
		}
		return -(low + 1);  // key not found.
	}
	
	private StyleRange createStyleRange(int start, int end, Style style) {
		StyleRange styleRange= new StyleRange();
		styleRange.start= start;
		styleRange.length= end - start;
		style.applyStyles(styleRange);
		return styleRange;
	}
	
	
	/* (non-Javadoc)
	 * @see java.lang.Object#toString()
	 */
	public String toString() {
		return fBuffer.toString();
	}
	
	private boolean hasRuns() {
		return fStyleRuns != null && !fStyleRuns.isEmpty();
	}
		
	private void appendStyleRun(Style style, int offset) {
		StyleRun lastRun= getLastRun();
		if (lastRun != null && lastRun.offset == offset) {
			lastRun.style= style;
			return;
		}
		
		if (lastRun == null && style != null || lastRun != null && isDifferentStyle(style, lastRun.style)) {
			getStyleRuns().add(new StyleRun(offset, style));
		}
	}
	
	private boolean isDifferentStyle(Style style1, Style style2) {
		if (style1 == null) {
			return style2 != null;
		}
		return !style1.equals(style2);
	}
	
	private StyleRun getLastRun() {
		if (fStyleRuns == null || fStyleRuns.isEmpty()) {
			return null;
		}
		return fStyleRuns.getRun(fStyleRuns.size() - 1);
	}
	
	private List getStyleRuns() {
		if (fStyleRuns == null)
			fStyleRuns= new StyleRunList();
		return fStyleRuns;
	}
	
	private static class StyleRun {
		public int offset;
		public Style style;
		
		public StyleRun(int offset, Style style) {
			this.offset= offset;
			this.style= style;
		}
		
		public String toString() {
			return "Offset " + offset + ", style: " + style.toString();  //$NON-NLS-1$//$NON-NLS-2$
		}
	}
	
	private static class StyleRunList extends ArrayList {
		private static final long serialVersionUID= 123L;

		public StyleRunList() {
			super(3);
		}

		public StyleRun getRun(int index) {
			return (StyleRun) get(index);
		}
				
		public void removeRange(int fromIndex, int toIndex) {
			super.removeRange(fromIndex, toIndex);
		}	
	}
}




/*******************************************************************************
 * Copyright (c) 2000, 2008 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

import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.viewers.LabelProviderChangedEvent;
import org.eclipse.jface.viewers.StyledString;

import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMember;

import org.eclipse.jdt.ui.JavaElementLabels;

import org.eclipse.jdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;
import org.eclipse.jdt.internal.ui.viewsupport.ColoredString;
import org.eclipse.jdt.internal.ui.viewsupport.ColoredViewersManager;

/**

	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.jdt.internal.ui.viewsupport.JavaUILabelProvider#getStyledText(java.lang.Object)
	 */
	public StyledString getStyledText(Object element) {
		StyledString text= super.getStyledText(element);
		String qualifier= getQualifier(element);
		if (qualifier != null) {
			StyledString StyledString= new StyledString(qualifier);
			StyledString.append(text);
			return StyledString;
		}
		return text;
		




/*******************************************************************************
 * Copyright (c) 2000, 2008 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

import org.eclipse.swt.graphics.Image;

import org.eclipse.jface.viewers.ILabelDecorator;
import org.eclipse.jface.viewers.StyledString;

import org.eclipse.ui.model.IWorkbenchAdapter;



import org.eclipse.jdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;
import org.eclipse.jdt.internal.ui.viewsupport.ColoredJavaElementLabels;
import org.eclipse.jdt.internal.ui.viewsupport.ColoredString;
import org.eclipse.jdt.internal.ui.viewsupport.JavaElementImageProvider;

class CallHierarchyLabelProvider extends AppearanceAwareLabelProvider {

    }
    
    /* (non-Javadoc)
     * @see org.eclipse.jdt.internal.ui.viewsupport.JavaUILabelProvider#getStyledText(java.lang.Object)
     */
    public StyledString getStyledText(Object element) {
        if (element instanceof MethodWrapper && ((MethodWrapper) element).getMember() != null) {
        	MethodWrapper wrapper= (MethodWrapper) element;
        	String decorated= getElementLabel(wrapper);
        	StyledString text= super.getStyledText(wrapper.getMember());
        	return ColoredJavaElementLabels.decorateStyledString(text, decorated, ColoredJavaElementLabels.COUNTER_STYLE);
        }
        return new StyledString(getSpecialLabel(element));
    }
    
    private String getSpecialLabel(Object element) {

Lines 49-55 Link Here

(-)ui/org/eclipse/jdt/internal/ui/javaeditor/breadcrumb/BreadcrumbItemDropDown.java (-2 / +1 lines)
49	import org.eclipse.jdt.internal.ui.JavaPluginImages;	49	import org.eclipse.jdt.internal.ui.JavaPluginImages;
50	import org.eclipse.jdt.internal.ui.javaeditor.breadcrumb.FilteredTable.Direction;	50	import org.eclipse.jdt.internal.ui.javaeditor.breadcrumb.FilteredTable.Direction;
51	import org.eclipse.jdt.internal.ui.javaeditor.breadcrumb.FilteredTable.INavigateListener;	51	import org.eclipse.jdt.internal.ui.javaeditor.breadcrumb.FilteredTable.INavigateListener;
52	import org.eclipse.jdt.internal.ui.viewsupport.ColoringLabelProvider;
53		52
54		53
55	/**	54	/**
Lines 234-240 Link Here
234	return false;	233	return false;
235	}	234	}
236	});	235	});
237	viewer.setLabelProvider(new ColoringLabelProvider(fLabelProvider));	236	viewer.setLabelProvider(fLabelProvider);
238	viewer.setComparator(new JavaElementComparator());	237	viewer.setComparator(new JavaElementComparator());
239	viewer.setInput(fParent.getInput());	238	viewer.setInput(fParent.getInput());
240		239




/*******************************************************************************
 * Copyright (c) 2000, 2008 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


import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Item;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.Text;

import org.eclipse.jface.action.Action;

import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.LabelProviderChangedEvent;
import org.eclipse.jface.viewers.StyledString;
import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;

import org.eclipse.jface.text.ITextSelection;


import org.eclipse.jdt.internal.ui.search.JavaSearchScopeFactory;
import org.eclipse.jdt.internal.ui.util.ExceptionHandler;
import org.eclipse.jdt.internal.ui.util.TypeNameMatchLabelProvider;
import org.eclipse.jdt.internal.ui.viewsupport.ColoredJavaElementLabels;
import org.eclipse.jdt.internal.ui.viewsupport.ColoredString;
import org.eclipse.jdt.internal.ui.viewsupport.ColoredViewersManager;
import org.eclipse.jdt.internal.ui.viewsupport.OwnerDrawSupport;
import org.eclipse.jdt.internal.ui.workingsets.WorkingSetFilterActionGroup;

/**

		super.configureShell(shell);
		PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, IJavaHelpContextIds.TYPE_SELECTION_DIALOG2);
	}
	
	protected Control createContents(Composite parent) {
		Control contents= super.createContents(parent);
		if (ColoredViewersManager.showColoredLabels()) {
			if (contents instanceof Composite) {
				Table listControl= findTableControl((Composite) contents);
				if (listControl != null) {
					installOwnerDraw(listControl);
				}
			}
		}
		return contents;
	}
	
	private void installOwnerDraw(Table tableControl) {
		new OwnerDrawSupport(tableControl) { // installs the owner draw listeners
			public ColoredString getColoredLabel(Item item) {
				String text= item.getText();
				ColoredString str= new ColoredString(text);
				int index= text.indexOf('-');
				if (index != -1) {
					str.setStyle(index, str.length() - index, ColoredJavaElementLabels.QUALIFIER_STYLE);
				}
				return str;
			}

			public Color getColor(String foregroundColorName, Display display) {
				return PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry().get(foregroundColorName);
			}
		};
	}

	private Table findTableControl(Composite composite) {
		Control[] children= composite.getChildren();
		for (int i= 0; i < children.length; i++) {
			Control curr= children[i];
			if (curr instanceof Table) {
				return (Table) curr;
			} else if (curr instanceof Composite) {
				Table res= findTableControl((Composite) curr);
				if (res != null) {
					return res;
				}
			}
		}
		return null;
	}
	
	

	/*
	 * (non-Javadoc)

	/**
	 * A <code>LabelProvider</code> for (the table of) types.
	 */
	private class TypeItemLabelProvider extends LabelProvider implements ILabelDecorator, IStyledLabelProvider {

		private boolean fContainerInfo;
		private LocalResourceManager fImageManager;

			return fTypeInfoUtil.getQualifiedText((TypeNameMatch) element);
		}

		/* (non-Javadoc)
		 * @see org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider#getStyledText(java.lang.Object)
		 */
		public StyledString getStyledText(Object element) {
			String text= getText(element);
			StyledString string= new StyledString(text);			
			int index= text.indexOf(JavaElementLabels.CONCAT_STRING);
			if (index != -1) {
				string.setStyle(index, text.length() - index, StyledString.QUALIFIER_STYLE);
			}
			return string;
		}

	}

	/**




import org.eclipse.jdt.internal.ui.javaeditor.breadcrumb.BreadcrumbViewer;
import org.eclipse.jdt.internal.ui.javaeditor.breadcrumb.EditorBreadcrumb;
import org.eclipse.jdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;
import org.eclipse.jdt.internal.ui.viewsupport.ColoredString;
import org.eclipse.jdt.internal.ui.viewsupport.DecoratingJavaLabelProvider;
import org.eclipse.jdt.internal.ui.viewsupport.IRichLabelProvider;
import org.eclipse.jdt.internal.ui.viewsupport.JavaElementImageProvider;
import org.eclipse.jdt.internal.ui.viewsupport.ResourceToItemsMapper;


		}
	}

	private static final class JavaBreadcrumbLabelProvider implements ILabelProvider, IViewerLabelProvider {

		private final DecoratingJavaLabelProvider fParent;


		}

		/*
		 * @see org.eclipse.jdt.internal.ui.viewsupport.IRichLabelProvider#getRichTextLabel(java.lang.Object)
		 */
		public ColoredString getRichTextLabel(Object object) {
			return fParent.getRichTextLabel(object);
		}

		/*
		 * @see org.eclipse.jface.viewers.IViewerLabelProvider#updateLabel(org.eclipse.jface.viewers.ViewerLabel, java.lang.Object)
		 */
		public void updateLabel(ViewerLabel label, Object element) {




/*******************************************************************************
 * Copyright (c) 2000, 2005 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.ui.tests.core;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;

import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyleRange;
import org.eclipse.swt.graphics.TextStyle;

import org.eclipse.jdt.internal.ui.viewsupport.ColoredString;
import org.eclipse.jdt.internal.ui.viewsupport.ColoredString.Style;

public class ColoredStringsTest extends TestCase {
	
	public static class TestStyle extends Style {
		
		public final int borderStyle;

		public TestStyle(int borderStyle) {
			this.borderStyle= borderStyle;
		}
		
		public void applyStyles(TextStyle textStyle) {
			textStyle.borderStyle= borderStyle;
		}
	}
	
	public static final TestStyle STYLE1= new TestStyle(SWT.BORDER_DOT);
	public static final TestStyle STYLE2= new TestStyle(SWT.BORDER_DASH);
	
	
	public static Test allTests() {
		return new TestSuite(ColoredStringsTest.class);
	}

	public static Test suite() {
		return allTests();
	}
	
	public void testEmpty() {
		ColoredString coloredString= new ColoredString();
		
		String str= "";
		
		assertEquals(str.length(), coloredString.length());
		assertEquals(str, coloredString.getString());
		assertEquals(coloredString.getStyleRanges().length, 0);
	}
	
	public void testAppendString1() {
		ColoredString coloredString= new ColoredString();
		
		String str= "Hello";
		
		coloredString.append(str, STYLE1);
		
		assertEquals(str.length(), coloredString.length());
		assertEquals(str, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, 0, str.length());
	}
	
	public void testAppendString2() {
		ColoredString coloredString= new ColoredString();
		
		String str1= "Hello";
		String str2= "You";
		coloredString.append(str1);
		coloredString.append(str2, STYLE1);
		
		String res= str1 + str2;
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, str1.length(), str2.length());
	}
	
	public void testAppendString3() {
		ColoredString coloredString= new ColoredString();
		
		String str1= "Hello";
		String str2= "You";
		coloredString.append(str1, STYLE1);
		coloredString.append(str2);
		
		String res= str1 + str2;
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, 0, str1.length());
	}
	
	public void testAppendString4() {
		ColoredString coloredString= new ColoredString();
		
		String str1= "Hello";
		String str2= "You";
		coloredString.append(str1);
		coloredString.append(str2, STYLE1);
		coloredString.append(str2, STYLE1);
		
		String res= str1 + str2 + str2;
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, str1.length(), str2.length() * 2);
	}
	
	public void testAppendString5() {
		ColoredString coloredString= new ColoredString();
		
		String str1= "Hello";
		String str2= "You";
		String str3= "Me";
		coloredString.append(str1);
		coloredString.append(str2, STYLE1);
		coloredString.append(str3, STYLE2);
		
		String res= str1 + str2 + str3;
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, str1.length(), str2.length());
		assertEquals(styleRanges[1], STYLE2, str1.length() + str2.length(), str3.length());
	}
	
	public void testAppendString6() {
		ColoredString coloredString= new ColoredString();
		
		String str1= "Hello";
		String str2= "You";
		String str3= "Me";
		coloredString.append(str1, STYLE1);
		coloredString.append(str2);
		coloredString.append(str3, STYLE2);
		
		String res= str1 + str2 + str3;
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, 0, str1.length());
		assertEquals(styleRanges[1], STYLE2, str1.length() + str2.length(), str3.length());
	}
	
	public void testAppendString7() {
		ColoredString coloredString= new ColoredString();
		
		String str1= "Hello";
		String str2= "";
		String str3= "Me";
		coloredString.append(str1, STYLE1);
		coloredString.append(str2, STYLE2);
		coloredString.append(str3, STYLE1);
		
		String res= str1 + str2 + str3;
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, 0, res.length());
	}
	
	public void testAppendChar1() {
		ColoredString coloredString= new ColoredString();
		
		coloredString.append('H', STYLE1);
		coloredString.append('2', STYLE2);
		coloredString.append('O', STYLE1);
		
		String res= "H2O";
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(3, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, 0, 1);
		assertEquals(styleRanges[1], STYLE2, 1, 1);
		assertEquals(styleRanges[2], STYLE1, 2, 1);
	}
	
	public void testAppendChar2() {
		ColoredString coloredString= new ColoredString();
		
		coloredString.append('H', STYLE1);
		coloredString.append('2');
		coloredString.append('O', STYLE2);
		
		String res= "H2O";
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, 0, 1);
		assertEquals(styleRanges[1], STYLE2, 2, 1);
	}
	
	public void testAppendColoredString1() {
		ColoredString other= new ColoredString();
		
		String str2= "You";
		String str3= "Me";
		other.append(str2, STYLE1);
		other.append(str3, STYLE2);
		
		String str1= "We";
		
		ColoredString coloredString= new ColoredString(str1);
		coloredString.append(other);
		
		String res= str1 + str2 + str3;
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, str1.length(), str2.length());
		assertEquals(styleRanges[1], STYLE2, str1.length() + str2.length(), str3.length());
	}
	
	public void testAppendColoredString2() {
		ColoredString other= new ColoredString();
		
		String str2= "You";
		String str3= "Me";
		other.append(str2, STYLE1);
		other.append(str3, STYLE2);
		
		String str1= "We";
		
		ColoredString coloredString= new ColoredString(str1, STYLE1);
		coloredString.append(other);
		
		String res= str1 + str2 + str3;
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, 0, str1.length() + str2.length());
		assertEquals(styleRanges[1], STYLE2, str1.length() + str2.length(), str3.length());
	}
	
	public void testAppendColoredString3() {
		
		ColoredString other= new ColoredString();
		
		String str2= "You";
		String str3= "Me";
		other.append(str2);
		other.append(str3, STYLE2);
		
		String str1= "We";
		
		ColoredString coloredString= new ColoredString(str1, STYLE1);
		coloredString.append(other);
		
		String res= str1 + str2 + str3;
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, 0, str1.length());
		assertEquals(styleRanges[1], STYLE2, str1.length() + str2.length(), str3.length());
	}
	
	public void testAppendColoredString4() {
		
		ColoredString other= new ColoredString();
		
		String str2= "You";
		String str3= "Me";
		other.append(str2, STYLE2);
		other.append(str3);
		
		String str1= "We";
		
		ColoredString coloredString= new ColoredString(str1, STYLE1);
		coloredString.append(other);
		
		String res= str1 + str2 + str3;
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, 0, str1.length());
		assertEquals(styleRanges[1], STYLE2, str1.length(), str2.length());
	}
	
	public void testAppendColoredString5() {
		ColoredString other= new ColoredString();
		
		String str2= "You";
		String str3= "Me";
		other.append(str2);
		other.append(str3, STYLE1);
		
		String str1= "We";
		
		ColoredString coloredString= new ColoredString(str1);
		coloredString.append(other);
		
		String res= str1 + str2 + str3;
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, str1.length() +  str2.length(), str3.length());
	}
	
	public void testSetStyle1() {
		String str1= "One";
		String str2= "Two";
		String str3= "Three";
		
		String res= str1 + str2 + str3;
		
		ColoredString coloredString= new ColoredString();
		coloredString.append(res);
		
		coloredString.setStyle(0, str1.length(), STYLE1);
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, 0, str1.length());
	}
	
	public void testSetStyle2() {
		
		String str1= "One";
		String str2= "Two";
		String str3= "Three";
		
		String res= str1 + str2 + str3;
		
		ColoredString coloredString= new ColoredString();
		coloredString.append(res);
		
		coloredString.setStyle(str1.length(), str2.length(), STYLE1);
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, str1.length(), str2.length());
	}
	
	public void testSetStyle3() {
		
		String str1= "One";
		String str2= "Two";
		String str3= "Three";
		
		String res= str1 + str2 + str3;
		
		ColoredString coloredString= new ColoredString();
		coloredString.append(res);
		
		coloredString.setStyle(str1.length(), res.length() - str1.length(), STYLE1);
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, str1.length(), res.length() - str1.length());
	}
	
	public void testSetStyle4() {
		
		String str1= "One";
		String str2= "Two";
		String str3= "Three";
		
		String res= str1 + str2 + str3;
		
		ColoredString coloredString= new ColoredString();
		coloredString.append(res);
		
		coloredString.setStyle(0, res.length(), STYLE1);
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, 0, res.length());
	}
	
	public void testSetStyle5() {
		
		String str1= "One";
		String str2= "Two";
		String str3= "Three";
		
		String res= str1 + str2 + str3;
		
		ColoredString coloredString= new ColoredString();
		coloredString.append(res);
		
		coloredString.setStyle(0, res.length(), null);
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(0, styleRanges.length);
	}
	
	public void testSetStyle6() {
		
		String str1= "One";
		String str2= "Two";
		
		String res= str1 + str2;
		
		ColoredString coloredString= new ColoredString(str1, STYLE1);
		coloredString.append(str2);
		
		coloredString.setStyle(str1.length(), str2.length(), STYLE2);
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, 0, str1.length());
		assertEquals(styleRanges[1], STYLE2, str1.length(), str2.length());
	}
	
	public void testSetStyle7() {
		
		String str1= "One";
		String str2= "Two";
		
		String res= str1 + str2;
		
		ColoredString coloredString= new ColoredString(str1);
		coloredString.append(str2, STYLE1);
		
		coloredString.setStyle(0, str1.length(), STYLE2);
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		assertEquals(styleRanges[0], STYLE2, 0, str1.length());
		assertEquals(styleRanges[1], STYLE1, str1.length(), str2.length());
	}
	
	public void testSetStyle8() {
		
		String str1= "One";
		String str2= "Two";
		
		String res= str1 + str2;
		
		ColoredString coloredString= new ColoredString();
		coloredString.append(str1, STYLE1);
		coloredString.append(str2, STYLE2);
		
		coloredString.setStyle(0, str1.length(), STYLE2);
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		assertEquals(styleRanges[0], STYLE2, 0, res.length());
	}
	
	public void testSetStyle9() {
		
		String str1= "One";
		String str2= "Two";
		
		String res= str1 + str2;
		
		ColoredString coloredString= new ColoredString();
		coloredString.append(str1, STYLE1);
		coloredString.append(str2, STYLE2);
		
		coloredString.setStyle(0, res.length(), null);
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(0, styleRanges.length);
	}
	
	public void testSetStyle10() {
		
		String str1= "One";
		String str2= "Two";
		
		String res= str1 + str2;
		
		ColoredString coloredString= new ColoredString();
		coloredString.append(str1, STYLE1);
		coloredString.append(str2, STYLE2);
		
		coloredString.setStyle(1, res.length() - 2, null);
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, 0, 1);
		assertEquals(styleRanges[1], STYLE2, res.length() - 1, 1);
	}
	
	public void testSetStyle11() {
		
		String str1= "One";
		String str2= "Two";
		
		String res= str1 + str2;
		
		ColoredString coloredString= new ColoredString();
		coloredString.append(str1, STYLE1);
		coloredString.append(str2, STYLE2);
		
		coloredString.setStyle(1, res.length() - 1, STYLE1);
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, 0, res.length());
	}
	
	public void testSetStyle12() {
		
		String str1= "One";
		String str2= "Two";
		
		String res= str1 + str2;
		
		ColoredString coloredString= new ColoredString();
		coloredString.append(str1, STYLE1);
		coloredString.append(str2, STYLE2);
		
		coloredString.setStyle(0, res.length() - 1, STYLE2);
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE2, 0, res.length());
	}
	
	public void testSetStyle13() {
		
		String str1= "One";
		String str2= "Two";
		
		String res= str1 + str2;
		
		ColoredString coloredString= new ColoredString();
		coloredString.append(str1, STYLE1);
		coloredString.append(str2, STYLE2);
		
		coloredString.setStyle(1, res.length() - 2, STYLE1);
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, 0, res.length() - 1);
		assertEquals(styleRanges[1], STYLE2, res.length() - 1, 1);
	}
	
	public void testSetStyle14() {
		
		String str1= "One";
		String str2= "Two";
		
		String res= str1 + str2;
		
		ColoredString coloredString= new ColoredString();
		coloredString.append(str1, STYLE1);
		coloredString.append(str2, STYLE2);
		
		coloredString.setStyle(1, res.length() - 2, STYLE2);
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, 0, 1);
		assertEquals(styleRanges[1], STYLE2, 1, res.length() - 1);
	}
	
	public void testSetStyle15() {
		
		String str1= "One";
		String str2= "Two";
		
		String res= str1 + str2;
		
		ColoredString coloredString= new ColoredString();
		coloredString.append(str1, null);
		coloredString.append(str2, STYLE2);
		
		coloredString.setStyle(0, 1, STYLE1);
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, 0, 1);
		assertEquals(styleRanges[1], STYLE2, str1.length(), str2.length());
	}
	
	public void testSetStyle16() {
				
		String res= "H2O";
		
		ColoredString coloredString= new ColoredString();
		coloredString.append('H', null);
		coloredString.append('2', STYLE1);
		coloredString.append('O', STYLE2);
		
		coloredString.setStyle(0, res.length(), STYLE1);
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, 0, res.length());
	}
	
	public void testSetStyle17() {
		
		String res= "H2O";
		
		ColoredString coloredString= new ColoredString();
		coloredString.append('H', null);
		coloredString.append('2', STYLE1);
		coloredString.append('O', STYLE2);
		
		coloredString.setStyle(0, res.length(), null);
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(0, styleRanges.length);
	}
	
	public void testSetStyle18() {
		String res= "H2OH2O";
		
		ColoredString coloredString= new ColoredString();
		coloredString.append('H', null);
		coloredString.append('2', STYLE1);
		coloredString.append('O', STYLE2);
		coloredString.append('H', null);
		coloredString.append('2', STYLE2);
		coloredString.append('O', STYLE1);
		
		coloredString.setStyle(1, res.length() - 2, STYLE1);
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, 1, res.length() - 1);
	}
	
	public void testSetStyle19() {
		String res= "O2O2O2O2O2O2";
		
		ColoredString coloredString= new ColoredString();
		coloredString.append("O2", null);
		coloredString.append("O2", STYLE1);
		coloredString.append("O2", STYLE2);
		coloredString.append("O2", STYLE1);
		coloredString.append("O2", STYLE2);
		coloredString.append("O2", null);
		
		coloredString.setStyle(1, res.length() - 2, STYLE1);
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, 1, res.length() - 2);
	}
	
	public void testSetStyle20() {
		String res= "O2O2O2O2O2O2";
		
		ColoredString coloredString= new ColoredString();
		coloredString.append("O2", null);
		coloredString.append("O2", STYLE1);
		coloredString.append("O2", STYLE2);
		coloredString.append("O2", STYLE1);
		coloredString.append("O2", STYLE2);
		coloredString.append("O2", null);
		
		coloredString.setStyle(3, 6, null);
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, 2, 1);
		assertEquals(styleRanges[1], STYLE2, 9, 1);
	}
	
	public void testSetStyle21() {
		String res= "O2O2O2O2O2O2";
		
		ColoredString coloredString= new ColoredString();
		coloredString.append("O2", null);
		coloredString.append("O2", STYLE1);
		coloredString.append("O2", STYLE2);
		coloredString.append("O2", STYLE1);
		coloredString.append("O2", STYLE2);
		coloredString.append("O2", null);
		
		coloredString.setStyle(3, 6, STYLE1);
		coloredString.setStyle(3, 6, null);
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, 2, 1);
		assertEquals(styleRanges[1], STYLE2, 9, 1);
	}
	
	public void testCombination1() {
		String str1= "One";
		String str2= "Two";
		
		String res= str1 + str2 + str1;
		
		ColoredString coloredString= new ColoredString();
		coloredString.append(str1, null);
		coloredString.append(str2, STYLE2);
		
		coloredString.setStyle(str1.length(), str2.length(), STYLE1);
		
		coloredString.append(str1, STYLE1);
		
		assertEquals(res.length(), coloredString.length());
		assertEquals(res, coloredString.getString());
		StyleRange[] styleRanges= coloredString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, str1.length(), str2.length() + str1.length());
	}
	
	
	private void assertEquals(StyleRange range, TestStyle style, int offset, int length) {
		assertEquals(offset, range.start);
		assertEquals(length, range.length);
		assertEquals(style.borderStyle, range.borderStyle);
	}
	
	
}




/*******************************************************************************
 * Copyright (c) 2008 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.ui.tests.core;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;

import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyleRange;
import org.eclipse.swt.graphics.TextStyle;

import org.eclipse.jface.viewers.StyledString;
import org.eclipse.jface.viewers.StyledString.Style;

public class StyledStringTest extends TestCase {
	
	public static class TestStyle extends Style {
		
		public final int borderStyle;

		public TestStyle(int borderStyle) {
			this.borderStyle= borderStyle;
		}
		
		public void applyStyles(TextStyle textStyle) {
			textStyle.borderStyle= borderStyle;
		}
	}
	
	public static final TestStyle STYLE1= new TestStyle(SWT.BORDER_DOT);
	public static final TestStyle STYLE2= new TestStyle(SWT.BORDER_DASH);
	
	
	public static Test allTests() {
		return new TestSuite(StyledStringTest.class);
	}

	public static Test suite() {
		return allTests();
	}
	
	public void testEmpty() {
		StyledString StyledString= new StyledString();
		
		String str= "";
		
		assertEquals(str.length(), StyledString.length());
		assertEquals(str, StyledString.getString());
		assertEquals(StyledString.getStyleRanges().length, 0);
	}
	
	public void testAppendString1() {
		StyledString StyledString= new StyledString();
		
		String str= "Hello";
		
		StyledString.append(str, STYLE1);
		
		assertEquals(str.length(), StyledString.length());
		assertEquals(str, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, 0, str.length());
	}
	
	public void testAppendString2() {
		StyledString StyledString= new StyledString();
		
		String str1= "Hello";
		String str2= "You";
		StyledString.append(str1);
		StyledString.append(str2, STYLE1);
		
		String res= str1 + str2;
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, str1.length(), str2.length());
	}
	
	public void testAppendString3() {
		StyledString StyledString= new StyledString();
		
		String str1= "Hello";
		String str2= "You";
		StyledString.append(str1, STYLE1);
		StyledString.append(str2);
		
		String res= str1 + str2;
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, 0, str1.length());
	}
	
	public void testAppendString4() {
		StyledString StyledString= new StyledString();
		
		String str1= "Hello";
		String str2= "You";
		StyledString.append(str1);
		StyledString.append(str2, STYLE1);
		StyledString.append(str2, STYLE1);
		
		String res= str1 + str2 + str2;
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, str1.length(), str2.length() * 2);
	}
	
	public void testAppendString5() {
		StyledString StyledString= new StyledString();
		
		String str1= "Hello";
		String str2= "You";
		String str3= "Me";
		StyledString.append(str1);
		StyledString.append(str2, STYLE1);
		StyledString.append(str3, STYLE2);
		
		String res= str1 + str2 + str3;
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, str1.length(), str2.length());
		assertEquals(styleRanges[1], STYLE2, str1.length() + str2.length(), str3.length());
	}
	
	public void testAppendString6() {
		StyledString StyledString= new StyledString();
		
		String str1= "Hello";
		String str2= "You";
		String str3= "Me";
		StyledString.append(str1, STYLE1);
		StyledString.append(str2);
		StyledString.append(str3, STYLE2);
		
		String res= str1 + str2 + str3;
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, 0, str1.length());
		assertEquals(styleRanges[1], STYLE2, str1.length() + str2.length(), str3.length());
	}
	
	public void testAppendString7() {
		StyledString StyledString= new StyledString();
		
		String str1= "Hello";
		String str2= "";
		String str3= "Me";
		StyledString.append(str1, STYLE1);
		StyledString.append(str2, STYLE2);
		StyledString.append(str3, STYLE1);
		
		String res= str1 + str2 + str3;
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, 0, res.length());
	}
	
	public void testAppendChar1() {
		StyledString StyledString= new StyledString();
		
		StyledString.append('H', STYLE1);
		StyledString.append('2', STYLE2);
		StyledString.append('O', STYLE1);
		
		String res= "H2O";
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(3, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, 0, 1);
		assertEquals(styleRanges[1], STYLE2, 1, 1);
		assertEquals(styleRanges[2], STYLE1, 2, 1);
	}
	
	public void testAppendChar2() {
		StyledString StyledString= new StyledString();
		
		StyledString.append('H', STYLE1);
		StyledString.append('2');
		StyledString.append('O', STYLE2);
		
		String res= "H2O";
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, 0, 1);
		assertEquals(styleRanges[1], STYLE2, 2, 1);
	}
	
	public void testAppendStyledString1() {
		StyledString other= new StyledString();
		
		String str2= "You";
		String str3= "Me";
		other.append(str2, STYLE1);
		other.append(str3, STYLE2);
		
		String str1= "We";
		
		StyledString StyledString= new StyledString(str1);
		StyledString.append(other);
		
		String res= str1 + str2 + str3;
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, str1.length(), str2.length());
		assertEquals(styleRanges[1], STYLE2, str1.length() + str2.length(), str3.length());
	}
	
	public void testAppendStyledString2() {
		StyledString other= new StyledString();
		
		String str2= "You";
		String str3= "Me";
		other.append(str2, STYLE1);
		other.append(str3, STYLE2);
		
		String str1= "We";
		
		StyledString StyledString= new StyledString(str1, STYLE1);
		StyledString.append(other);
		
		String res= str1 + str2 + str3;
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, 0, str1.length() + str2.length());
		assertEquals(styleRanges[1], STYLE2, str1.length() + str2.length(), str3.length());
	}
	
	public void testAppendStyledString3() {
		
		StyledString other= new StyledString();
		
		String str2= "You";
		String str3= "Me";
		other.append(str2);
		other.append(str3, STYLE2);
		
		String str1= "We";
		
		StyledString StyledString= new StyledString(str1, STYLE1);
		StyledString.append(other);
		
		String res= str1 + str2 + str3;
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, 0, str1.length());
		assertEquals(styleRanges[1], STYLE2, str1.length() + str2.length(), str3.length());
	}
	
	public void testAppendStyledString4() {
		
		StyledString other= new StyledString();
		
		String str2= "You";
		String str3= "Me";
		other.append(str2, STYLE2);
		other.append(str3);
		
		String str1= "We";
		
		StyledString StyledString= new StyledString(str1, STYLE1);
		StyledString.append(other);
		
		String res= str1 + str2 + str3;
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, 0, str1.length());
		assertEquals(styleRanges[1], STYLE2, str1.length(), str2.length());
	}
	
	public void testAppendStyledString5() {
		StyledString other= new StyledString();
		
		String str2= "You";
		String str3= "Me";
		other.append(str2);
		other.append(str3, STYLE1);
		
		String str1= "We";
		
		StyledString StyledString= new StyledString(str1);
		StyledString.append(other);
		
		String res= str1 + str2 + str3;
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, str1.length() +  str2.length(), str3.length());
	}
	
	public void testSetStyle1() {
		String str1= "One";
		String str2= "Two";
		String str3= "Three";
		
		String res= str1 + str2 + str3;
		
		StyledString StyledString= new StyledString();
		StyledString.append(res);
		
		StyledString.setStyle(0, str1.length(), STYLE1);
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, 0, str1.length());
	}
	
	public void testSetStyle2() {
		
		String str1= "One";
		String str2= "Two";
		String str3= "Three";
		
		String res= str1 + str2 + str3;
		
		StyledString StyledString= new StyledString();
		StyledString.append(res);
		
		StyledString.setStyle(str1.length(), str2.length(), STYLE1);
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, str1.length(), str2.length());
	}
	
	public void testSetStyle3() {
		
		String str1= "One";
		String str2= "Two";
		String str3= "Three";
		
		String res= str1 + str2 + str3;
		
		StyledString StyledString= new StyledString();
		StyledString.append(res);
		
		StyledString.setStyle(str1.length(), res.length() - str1.length(), STYLE1);
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, str1.length(), res.length() - str1.length());
	}
	
	public void testSetStyle4() {
		
		String str1= "One";
		String str2= "Two";
		String str3= "Three";
		
		String res= str1 + str2 + str3;
		
		StyledString StyledString= new StyledString();
		StyledString.append(res);
		
		StyledString.setStyle(0, res.length(), STYLE1);
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, 0, res.length());
	}
	
	public void testSetStyle5() {
		
		String str1= "One";
		String str2= "Two";
		String str3= "Three";
		
		String res= str1 + str2 + str3;
		
		StyledString StyledString= new StyledString();
		StyledString.append(res);
		
		StyledString.setStyle(0, res.length(), null);
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(0, styleRanges.length);
	}
	
	public void testSetStyle6() {
		
		String str1= "One";
		String str2= "Two";
		
		String res= str1 + str2;
		
		StyledString StyledString= new StyledString(str1, STYLE1);
		StyledString.append(str2);
		
		StyledString.setStyle(str1.length(), str2.length(), STYLE2);
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		assertEquals(styleRanges[0], STYLE1, 0, str1.length());
		assertEquals(styleRanges[1], STYLE2, str1.length(), str2.length());
	}
	
	public void testSetStyle7() {
		
		String str1= "One";
		String str2= "Two";
		
		String res= str1 + str2;
		
		StyledString StyledString= new StyledString(str1);
		StyledString.append(str2, STYLE1);
		
		StyledString.setStyle(0, str1.length(), STYLE2);
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		assertEquals(styleRanges[0], STYLE2, 0, str1.length());
		assertEquals(styleRanges[1], STYLE1, str1.length(), str2.length());
	}
	
	public void testSetStyle8() {
		
		String str1= "One";
		String str2= "Two";
		
		String res= str1 + str2;
		
		StyledString StyledString= new StyledString();
		StyledString.append(str1, STYLE1);
		StyledString.append(str2, STYLE2);
		
		StyledString.setStyle(0, str1.length(), STYLE2);
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		assertEquals(styleRanges[0], STYLE2, 0, res.length());
	}
	
	public void testSetStyle9() {
		
		String str1= "One";
		String str2= "Two";
		
		String res= str1 + str2;
		
		StyledString StyledString= new StyledString();
		StyledString.append(str1, STYLE1);
		StyledString.append(str2, STYLE2);
		
		StyledString.setStyle(0, res.length(), null);
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(0, styleRanges.length);
	}
	
	public void testSetStyle10() {
		
		String str1= "One";
		String str2= "Two";
		
		String res= str1 + str2;
		
		StyledString StyledString= new StyledString();
		StyledString.append(str1, STYLE1);
		StyledString.append(str2, STYLE2);
		
		StyledString.setStyle(1, res.length() - 2, null);
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, 0, 1);
		assertEquals(styleRanges[1], STYLE2, res.length() - 1, 1);
	}
	
	public void testSetStyle11() {
		
		String str1= "One";
		String str2= "Two";
		
		String res= str1 + str2;
		
		StyledString StyledString= new StyledString();
		StyledString.append(str1, STYLE1);
		StyledString.append(str2, STYLE2);
		
		StyledString.setStyle(1, res.length() - 1, STYLE1);
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, 0, res.length());
	}
	
	public void testSetStyle12() {
		
		String str1= "One";
		String str2= "Two";
		
		String res= str1 + str2;
		
		StyledString StyledString= new StyledString();
		StyledString.append(str1, STYLE1);
		StyledString.append(str2, STYLE2);
		
		StyledString.setStyle(0, res.length() - 1, STYLE2);
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE2, 0, res.length());
	}
	
	public void testSetStyle13() {
		
		String str1= "One";
		String str2= "Two";
		
		String res= str1 + str2;
		
		StyledString StyledString= new StyledString();
		StyledString.append(str1, STYLE1);
		StyledString.append(str2, STYLE2);
		
		StyledString.setStyle(1, res.length() - 2, STYLE1);
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, 0, res.length() - 1);
		assertEquals(styleRanges[1], STYLE2, res.length() - 1, 1);
	}
	
	public void testSetStyle14() {
		
		String str1= "One";
		String str2= "Two";
		
		String res= str1 + str2;
		
		StyledString StyledString= new StyledString();
		StyledString.append(str1, STYLE1);
		StyledString.append(str2, STYLE2);
		
		StyledString.setStyle(1, res.length() - 2, STYLE2);
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, 0, 1);
		assertEquals(styleRanges[1], STYLE2, 1, res.length() - 1);
	}
	
	public void testSetStyle15() {
		
		String str1= "One";
		String str2= "Two";
		
		String res= str1 + str2;
		
		StyledString StyledString= new StyledString();
		StyledString.append(str1, null);
		StyledString.append(str2, STYLE2);
		
		StyledString.setStyle(0, 1, STYLE1);
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, 0, 1);
		assertEquals(styleRanges[1], STYLE2, str1.length(), str2.length());
	}
	
	public void testSetStyle16() {
				
		String res= "H2O";
		
		StyledString StyledString= new StyledString();
		StyledString.append('H', null);
		StyledString.append('2', STYLE1);
		StyledString.append('O', STYLE2);
		
		StyledString.setStyle(0, res.length(), STYLE1);
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, 0, res.length());
	}
	
	public void testSetStyle17() {
		
		String res= "H2O";
		
		StyledString StyledString= new StyledString();
		StyledString.append('H', null);
		StyledString.append('2', STYLE1);
		StyledString.append('O', STYLE2);
		
		StyledString.setStyle(0, res.length(), null);
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(0, styleRanges.length);
	}
	
	public void testSetStyle18() {
		String res= "H2OH2O";
		
		StyledString StyledString= new StyledString();
		StyledString.append('H', null);
		StyledString.append('2', STYLE1);
		StyledString.append('O', STYLE2);
		StyledString.append('H', null);
		StyledString.append('2', STYLE2);
		StyledString.append('O', STYLE1);
		
		StyledString.setStyle(1, res.length() - 2, STYLE1);
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, 1, res.length() - 1);
	}
	
	public void testSetStyle19() {
		String res= "O2O2O2O2O2O2";
		
		StyledString StyledString= new StyledString();
		StyledString.append("O2", null);
		StyledString.append("O2", STYLE1);
		StyledString.append("O2", STYLE2);
		StyledString.append("O2", STYLE1);
		StyledString.append("O2", STYLE2);
		StyledString.append("O2", null);
		
		StyledString.setStyle(1, res.length() - 2, STYLE1);
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, 1, res.length() - 2);
	}
	
	public void testSetStyle20() {
		String res= "O2O2O2O2O2O2";
		
		StyledString StyledString= new StyledString();
		StyledString.append("O2", null);
		StyledString.append("O2", STYLE1);
		StyledString.append("O2", STYLE2);
		StyledString.append("O2", STYLE1);
		StyledString.append("O2", STYLE2);
		StyledString.append("O2", null);
		
		StyledString.setStyle(3, 6, null);
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, 2, 1);
		assertEquals(styleRanges[1], STYLE2, 9, 1);
	}
	
	public void testSetStyle21() {
		String res= "O2O2O2O2O2O2";
		
		StyledString StyledString= new StyledString();
		StyledString.append("O2", null);
		StyledString.append("O2", STYLE1);
		StyledString.append("O2", STYLE2);
		StyledString.append("O2", STYLE1);
		StyledString.append("O2", STYLE2);
		StyledString.append("O2", null);
		
		StyledString.setStyle(3, 6, STYLE1);
		StyledString.setStyle(3, 6, null);
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(2, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, 2, 1);
		assertEquals(styleRanges[1], STYLE2, 9, 1);
	}
	
	public void testCombination1() {
		String str1= "One";
		String str2= "Two";
		
		String res= str1 + str2 + str1;
		
		StyledString StyledString= new StyledString();
		StyledString.append(str1, null);
		StyledString.append(str2, STYLE2);
		
		StyledString.setStyle(str1.length(), str2.length(), STYLE1);
		
		StyledString.append(str1, STYLE1);
		
		assertEquals(res.length(), StyledString.length());
		assertEquals(res, StyledString.getString());
		StyleRange[] styleRanges= StyledString.getStyleRanges();
		assertEquals(1, styleRanges.length);
		
		assertEquals(styleRanges[0], STYLE1, str1.length(), str2.length() + str1.length());
	}
	
	
	private void assertEquals(StyleRange range, TestStyle style, int offset, int length) {
		assertEquals(offset, range.start);
		assertEquals(length, range.length);
		assertEquals(style.borderStyle, range.borderStyle);
	}
	
	
}

Return to bug 219393

Lines 980-986 Link Here

(-)plugin.xml (-3 / +3 lines)
980	label="%coloredLabels.qualifier.label"	980	label="%coloredLabels.qualifier.label"
981	categoryId="org.eclipse.jdt.ui.presentation"	981	categoryId="org.eclipse.jdt.ui.presentation"
982	value="COLOR_DARK_GRAY"	982	value="COLOR_DARK_GRAY"
983	id="org.eclipse.jdt.ui.ColoredLabels.qualifier">	983	id="QUALIFIER_COLOR">
984	<description>	984	<description>
985	%coloredLabels.qualifier.description	985	%coloredLabels.qualifier.description
986	</description>	986	</description>
Lines 989-995 Link Here
989	label="%coloredLabels.decorations.label"	989	label="%coloredLabels.decorations.label"
990	categoryId="org.eclipse.jdt.ui.presentation"	990	categoryId="org.eclipse.jdt.ui.presentation"
991	value="149,125,71"	991	value="149,125,71"
992	id="org.eclipse.jdt.ui.ColoredLabels.decorations">	992	id="DECORATIONS_COLOR">
993	<description>	993	<description>
994	%coloredLabels.decorations.description	994	%coloredLabels.decorations.description
995	</description>	995	</description>
Lines 998-1004 Link Here
998	label="%coloredLabels.counter.label"	998	label="%coloredLabels.counter.label"
999	categoryId="org.eclipse.jdt.ui.presentation"	999	categoryId="org.eclipse.jdt.ui.presentation"
1000	value="0,127,174"	1000	value="0,127,174"
1001	id="org.eclipse.jdt.ui.ColoredLabels.counter">	1001	id="COUNTER_COLOR">
1002	<description>	1002	<description>
1003	%coloredLabels.counter.description	1003	%coloredLabels.counter.description
1004	</description>	1004	</description>

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/browsing/PackagesViewLabelProvider.java (-6 / +5 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 18-23 Link Here
18	import org.eclipse.swt.graphics.Image;	18	import org.eclipse.swt.graphics.Image;
19		19
20	import org.eclipse.jface.resource.ImageDescriptor;	20	import org.eclipse.jface.resource.ImageDescriptor;
		21	import org.eclipse.jface.viewers.StyledString;
21		22
22	import org.eclipse.jdt.core.IPackageFragment;	23	import org.eclipse.jdt.core.IPackageFragment;
23	import org.eclipse.jdt.core.JavaModelException;	24	import org.eclipse.jdt.core.JavaModelException;
Lines 27-33 Link Here
27	import org.eclipse.jdt.internal.ui.JavaPlugin;	28	import org.eclipse.jdt.internal.ui.JavaPlugin;
28	import org.eclipse.jdt.internal.ui.JavaPluginImages;	29	import org.eclipse.jdt.internal.ui.JavaPluginImages;
29	import org.eclipse.jdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;	30	import org.eclipse.jdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;
30	import org.eclipse.jdt.internal.ui.viewsupport.ColoredString;
31	import org.eclipse.jdt.internal.ui.viewsupport.ImageDescriptorRegistry;	31	import org.eclipse.jdt.internal.ui.viewsupport.ImageDescriptorRegistry;
32	import org.eclipse.jdt.internal.ui.viewsupport.JavaElementImageProvider;	32	import org.eclipse.jdt.internal.ui.viewsupport.JavaElementImageProvider;
33	import org.eclipse.jdt.internal.ui.viewsupport.TreeHierarchyLayoutProblemsDecorator;	33	import org.eclipse.jdt.internal.ui.viewsupport.TreeHierarchyLayoutProblemsDecorator;
Lines 119-131 Link Here
119	/* (non-Javadoc)	119	/* (non-Javadoc)
120	* @see org.eclipse.jdt.internal.ui.viewsupport.JavaUILabelProvider#getRichTextLabel(java.lang.Object)	120	* @see org.eclipse.jdt.internal.ui.viewsupport.JavaUILabelProvider#getRichTextLabel(java.lang.Object)
121	*/	121	*/
122	public ColoredString getRichTextLabel(Object element) {	122	public StyledString getStyledText(Object element) {
123	if (element instanceof IPackageFragment \|\| element instanceof LogicalPackage)	123	if (element instanceof IPackageFragment \|\| element instanceof LogicalPackage)
124	return new ColoredString(getText(element));	124	return new StyledString(getText(element));
125	return super.getRichTextLabel(element);	125	return super.getStyledText(element);
126	}	126	}
127		127
128
129	private String getText(IPackageFragment fragment) {	128	private String getText(IPackageFragment fragment) {
130	if (isFlatView())	129	if (isFlatView())
131	return getFlatText(fragment);	130	return getFlatText(fragment);

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerLabelProvider.java (-6 / +6 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 22-27 Link Here
22	import org.eclipse.swt.graphics.Image;	22	import org.eclipse.swt.graphics.Image;
23		23
24	import org.eclipse.jface.resource.ImageDescriptor;	24	import org.eclipse.jface.resource.ImageDescriptor;
		25	import org.eclipse.jface.viewers.StyledString;
25		26
26	import org.eclipse.ui.IWorkingSet;	27	import org.eclipse.ui.IWorkingSet;
27		28
Lines 30-36 Link Here
30	import org.eclipse.jdt.ui.JavaElementLabels;	31	import org.eclipse.jdt.ui.JavaElementLabels;
31		32
32	import org.eclipse.jdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;	33	import org.eclipse.jdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;
33	import org.eclipse.jdt.internal.ui.viewsupport.ColoredString;
34	import org.eclipse.jdt.internal.ui.viewsupport.JavaElementImageProvider;	34	import org.eclipse.jdt.internal.ui.viewsupport.JavaElementImageProvider;
35		35
36	/**	36	/**
Lines 60-73 Link Here
60	}	60	}
61		61
62	/* (non-Javadoc)	62	/* (non-Javadoc)
63	* @see org.eclipse.jdt.internal.ui.viewsupport.JavaUILabelProvider#getRichTextLabel(java.lang.Object)	63	* @see org.eclipse.jdt.internal.ui.viewsupport.JavaUILabelProvider#getStyledText(java.lang.Object)
64	*/	64	*/
65	public ColoredString getRichTextLabel(Object element) {	65	public StyledString getStyledText(Object element) {
66	String text= getSpecificText(element);	66	String text= getSpecificText(element);
67	if (text != null) {	67	if (text != null) {
68	return new ColoredString(decorateText(text, element));	68	return new StyledString(decorateText(text, element));
69	}	69	}
70	return super.getRichTextLabel(element);	70	return super.getStyledText(element);
71	}	71	}
72		72
73	private String getSpecificText(Object element) {	73	private String getSpecificText(Object element) {

Removed Link Here

(-)ui/org/eclipse/jdt/internal/ui/viewsupport/OwnerDrawSupport.java (-160 lines)
1	/*******************************************************************************
2	* Copyright (c) 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.jdt.internal.ui.viewsupport;
12
13	import org.eclipse.swt.SWT;
14	import org.eclipse.swt.custom.StyleRange;
15	import org.eclipse.swt.graphics.Color;
16	import org.eclipse.swt.graphics.Font;
17	import org.eclipse.swt.graphics.GC;
18	import org.eclipse.swt.graphics.Image;
19	import org.eclipse.swt.graphics.Rectangle;
20	import org.eclipse.swt.graphics.TextLayout;
21	import org.eclipse.swt.widgets.Control;
22	import org.eclipse.swt.widgets.Display;
23	import org.eclipse.swt.widgets.Event;
24	import org.eclipse.swt.widgets.Item;
25	import org.eclipse.swt.widgets.Listener;
26	import org.eclipse.swt.widgets.TableItem;
27	import org.eclipse.swt.widgets.TreeItem;
28
29	import org.eclipse.jface.window.Window;
30
31	/**
32	* Adding owner draw support to a control
33	*/
34	public abstract class OwnerDrawSupport implements Listener {
35
36	private TextLayout fTextLayout;
37	private final Control fControl;
38
39	public OwnerDrawSupport(Control control) {
40	fControl= control;
41	fTextLayout= new TextLayout(control.getDisplay());
42	fTextLayout.setOrientation(Window.getDefaultOrientation());
43
44	control.addListener(SWT.PaintItem, this);
45	control.addListener(SWT.EraseItem, this);
46	control.addListener(SWT.Dispose, this);
47	}
48
49	/**
50	* Return the colored label for the given item.
51	* @param item the item to return the colored label for
52	* @return the colored string
53	*/
54	public abstract ColoredString getColoredLabel(Item item);
55
56	/**
57	* Return the color for the given style
58	* @param colorName the name of the color
59	* @param display the current display
60	* @return the color
61	*/
62	public abstract Color getColor(String colorName, Display display);
63
64	/* (non-Javadoc)
65	* @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
66	*/
67	public void handleEvent(Event event) {
68	if (event.type == SWT.PaintItem) {
69	performPaint(event);
70	} else if (event.type == SWT.EraseItem) {
71	performErase(event);
72	} else if (event.type == SWT.Dispose) {
73	dispose();
74	}
75	}
76
77	private void performErase(Event event) {
78	event.detail &= ~SWT.FOREGROUND;
79	}
80
81	private void performPaint(Event event) {
82	Item item= (Item) event.item;
83	GC gc= event.gc;
84
85	ColoredString coloredLabel= getColoredLabel(item);
86	boolean isSelected= (event.detail & SWT.SELECTED) != 0;
87	if (item instanceof TreeItem) {
88	TreeItem treeItem= (TreeItem) item;
89	Image image = treeItem.getImage(event.index);
90	if (image != null) {
91	processImage(image, gc, treeItem.getImageBounds(event.index));
92	}
93	Rectangle textBounds= treeItem.getTextBounds(event.index);
94	Font font= treeItem.getFont(event.index);
95	processColoredLabel(coloredLabel, gc, textBounds, isSelected, font);
96
97	Rectangle bounds= treeItem.getBounds();
98	if ((event.detail & SWT.FOCUSED) != 0) {
99	gc.drawFocus(bounds.x, bounds.y, bounds.width, bounds.height);
100	}
101	} else if (item instanceof TableItem) {
102	TableItem tableItem= (TableItem) item;
103	Image image = tableItem.getImage(event.index);
104	if (image != null) {
105	processImage(image, gc, tableItem.getImageBounds(event.index));
106	}
107	Rectangle textBounds= tableItem.getTextBounds(event.index);
108	Font font= tableItem.getFont(event.index);
109	processColoredLabel(coloredLabel, gc, textBounds, isSelected, font);
110
111	Rectangle bounds= tableItem.getBounds();
112	if ((event.detail & SWT.FOCUSED) != 0) {
113	gc.drawFocus(bounds.x, bounds.y, bounds.width, bounds.height);
114	}
115	}
116	}
117
118	private void processImage(Image image, GC gc, Rectangle imageBounds) {
119	Rectangle bounds= image.getBounds();
120	int x= imageBounds.x + Math.max(0, (imageBounds.width - bounds.width) / 2);
121	int y= imageBounds.y + Math.max(0, (imageBounds.height - bounds.height) / 2);
122	gc.drawImage(image, x, y);
123	}
124
125	private void processColoredLabel(ColoredString richLabel, GC gc, Rectangle textBounds, boolean isSelected, Font font) {
126	String text= richLabel.getString();
127	fTextLayout.setText(text);
128	fTextLayout.setFont(font);
129
130	// apply the styled ranges only when element is not selected
131	StyleRange[] styleRanges= richLabel.getStyleRanges();
132	for (int i= 0; i < styleRanges.length; i++) {
133	StyleRange styleRange= styleRanges[i];
134	if (isSelected) {
135	styleRange.foreground= null;
136	styleRange.background= null;
137	}
138	fTextLayout.setStyle(styleRange, styleRange.start, styleRange.start + styleRange.length - 1);
139	}
140
141	Rectangle bounds= fTextLayout.getBounds();
142	int x= textBounds.x;
143	int y = textBounds.y + Math.max(0, (textBounds.height - bounds.height) / 2);
144
145	fTextLayout.draw(gc, x, y);
146	fTextLayout.setText(""); // clear all ranges //$NON-NLS-1$
147	}
148
149	public void dispose() {
150	if (fTextLayout != null) {
151	fTextLayout.dispose();
152	fTextLayout= null;
153	}
154	if (!fControl.isDisposed()) {
155	fControl.removeListener(SWT.PaintItem, this);
156	fControl.removeListener(SWT.EraseItem, this);
157	fControl.removeListener(SWT.Dispose, this);
158	}
159	}
160	}

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/typehierarchy/MethodsLabelProvider.java (-6 / +8 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 16-21 Link Here
16	import org.eclipse.jface.util.IPropertyChangeListener;	16	import org.eclipse.jface.util.IPropertyChangeListener;
17	import org.eclipse.jface.util.PropertyChangeEvent;	17	import org.eclipse.jface.util.PropertyChangeEvent;
18	import org.eclipse.jface.viewers.LabelProviderChangedEvent;	18	import org.eclipse.jface.viewers.LabelProviderChangedEvent;
		19	import org.eclipse.jface.viewers.StyledString;
19		20
20	import org.eclipse.jdt.core.IJavaElement;	21	import org.eclipse.jdt.core.IJavaElement;
21	import org.eclipse.jdt.core.IMember;	22	import org.eclipse.jdt.core.IMember;
Lines 29-35 Link Here
29	import org.eclipse.jdt.ui.JavaElementLabels;	30	import org.eclipse.jdt.ui.JavaElementLabels;
30		31
31	import org.eclipse.jdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;	32	import org.eclipse.jdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;
32	import org.eclipse.jdt.internal.ui.viewsupport.ColoredString;
33	import org.eclipse.jdt.internal.ui.viewsupport.ColoredViewersManager;	33	import org.eclipse.jdt.internal.ui.viewsupport.ColoredViewersManager;
34		34
35	/**	35	/**
Lines 102-114 Link Here
102	}	102	}
103		103
104	/* (non-Javadoc)	104	/* (non-Javadoc)
105	* @see org.eclipse.jdt.internal.ui.viewsupport.JavaUILabelProvider#getRichTextLabel(java.lang.Object)	105	* @see org.eclipse.jdt.internal.ui.viewsupport.JavaUILabelProvider#getStyledText(java.lang.Object)
106	*/	106	*/
107	public ColoredString getRichTextLabel(Object element) {	107	public StyledString getStyledText(Object element) {
108	ColoredString text= super.getRichTextLabel(element);	108	StyledString text= super.getStyledText(element);
109	String qualifier= getQualifier(element);	109	String qualifier= getQualifier(element);
110	if (qualifier != null) {	110	if (qualifier != null) {
111	return new ColoredString(qualifier).append(text);	111	StyledString StyledString= new StyledString(qualifier);
		112	StyledString.append(text);
		113	return StyledString;
112	}	114	}
113	return text;	115	return text;
114		116

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyLabelProvider.java (-7 / +7 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 16-21 Link Here
16	import org.eclipse.swt.graphics.Image;	16	import org.eclipse.swt.graphics.Image;
17		17
18	import org.eclipse.jface.viewers.ILabelDecorator;	18	import org.eclipse.jface.viewers.ILabelDecorator;
		19	import org.eclipse.jface.viewers.StyledString;
19		20
20	import org.eclipse.ui.model.IWorkbenchAdapter;	21	import org.eclipse.ui.model.IWorkbenchAdapter;
21		22
Lines 26-32 Link Here
26		27
27	import org.eclipse.jdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;	28	import org.eclipse.jdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;
28	import org.eclipse.jdt.internal.ui.viewsupport.ColoredJavaElementLabels;	29	import org.eclipse.jdt.internal.ui.viewsupport.ColoredJavaElementLabels;
29	import org.eclipse.jdt.internal.ui.viewsupport.ColoredString;
30	import org.eclipse.jdt.internal.ui.viewsupport.JavaElementImageProvider;	30	import org.eclipse.jdt.internal.ui.viewsupport.JavaElementImageProvider;
31		31
32	class CallHierarchyLabelProvider extends AppearanceAwareLabelProvider {	32	class CallHierarchyLabelProvider extends AppearanceAwareLabelProvider {
Lines 70-85 Link Here
70	}	70	}
71		71
72	/* (non-Javadoc)	72	/* (non-Javadoc)
73	* @see org.eclipse.jdt.internal.ui.viewsupport.JavaUILabelProvider#getRichTextLabel(java.lang.Object)	73	* @see org.eclipse.jdt.internal.ui.viewsupport.JavaUILabelProvider#getStyledText(java.lang.Object)
74	*/	74	*/
75	public ColoredString getRichTextLabel(Object element) {	75	public StyledString getStyledText(Object element) {
76	if (element instanceof MethodWrapper && ((MethodWrapper) element).getMember() != null) {	76	if (element instanceof MethodWrapper && ((MethodWrapper) element).getMember() != null) {
77	MethodWrapper wrapper= (MethodWrapper) element;	77	MethodWrapper wrapper= (MethodWrapper) element;
78	String decorated= getElementLabel(wrapper);	78	String decorated= getElementLabel(wrapper);
79	ColoredString text= super.getRichTextLabel(wrapper.getMember());	79	StyledString text= super.getStyledText(wrapper.getMember());
80	return ColoredJavaElementLabels.decorateColoredString(text, decorated, ColoredJavaElementLabels.COUNTER_STYLE);	80	return ColoredJavaElementLabels.decorateStyledString(text, decorated, ColoredJavaElementLabels.COUNTER_STYLE);
81	}	81	}
82	return new ColoredString(getSpecialLabel(element));	82	return new StyledString(getSpecialLabel(element));
83	}	83	}
84		84
85	private String getSpecialLabel(Object element) {	85	private String getSpecialLabel(Object element) {

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/dialogs/FilteredTypesSelectionDialog.java (-59 / +17 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 32-46 Link Here
32		32
33	import org.eclipse.swt.events.DisposeEvent;	33	import org.eclipse.swt.events.DisposeEvent;
34	import org.eclipse.swt.events.DisposeListener;	34	import org.eclipse.swt.events.DisposeListener;
35	import org.eclipse.swt.graphics.Color;
36	import org.eclipse.swt.graphics.Image;	35	import org.eclipse.swt.graphics.Image;
37	import org.eclipse.swt.layout.GridData;	36	import org.eclipse.swt.layout.GridData;
38	import org.eclipse.swt.widgets.Composite;	37	import org.eclipse.swt.widgets.Composite;
39	import org.eclipse.swt.widgets.Control;	38	import org.eclipse.swt.widgets.Control;
40	import org.eclipse.swt.widgets.Display;
41	import org.eclipse.swt.widgets.Item;
42	import org.eclipse.swt.widgets.Shell;	39	import org.eclipse.swt.widgets.Shell;
43	import org.eclipse.swt.widgets.Table;
44	import org.eclipse.swt.widgets.Text;	40	import org.eclipse.swt.widgets.Text;
45		41
46	import org.eclipse.jface.action.Action;	42	import org.eclipse.jface.action.Action;
Lines 60-65 Link Here
60	import org.eclipse.jface.viewers.ISelection;	56	import org.eclipse.jface.viewers.ISelection;
61	import org.eclipse.jface.viewers.LabelProvider;	57	import org.eclipse.jface.viewers.LabelProvider;
62	import org.eclipse.jface.viewers.LabelProviderChangedEvent;	58	import org.eclipse.jface.viewers.LabelProviderChangedEvent;
		59	import org.eclipse.jface.viewers.StyledString;
		60	import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
63		61
64	import org.eclipse.jface.text.ITextSelection;	62	import org.eclipse.jface.text.ITextSelection;
65		63
Lines 114-123 Link Here
114	import org.eclipse.jdt.internal.ui.search.JavaSearchScopeFactory;	112	import org.eclipse.jdt.internal.ui.search.JavaSearchScopeFactory;
115	import org.eclipse.jdt.internal.ui.util.ExceptionHandler;	113	import org.eclipse.jdt.internal.ui.util.ExceptionHandler;
116	import org.eclipse.jdt.internal.ui.util.TypeNameMatchLabelProvider;	114	import org.eclipse.jdt.internal.ui.util.TypeNameMatchLabelProvider;
117	import org.eclipse.jdt.internal.ui.viewsupport.ColoredJavaElementLabels;
118	import org.eclipse.jdt.internal.ui.viewsupport.ColoredString;
119	import org.eclipse.jdt.internal.ui.viewsupport.ColoredViewersManager;
120	import org.eclipse.jdt.internal.ui.viewsupport.OwnerDrawSupport;
121	import org.eclipse.jdt.internal.ui.workingsets.WorkingSetFilterActionGroup;	115	import org.eclipse.jdt.internal.ui.workingsets.WorkingSetFilterActionGroup;
122		116
123	/**	117	/**
Lines 529-583 Link Here
529	super.configureShell(shell);	523	super.configureShell(shell);
530	PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, IJavaHelpContextIds.TYPE_SELECTION_DIALOG2);	524	PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, IJavaHelpContextIds.TYPE_SELECTION_DIALOG2);
531	}	525	}
532
533	protected Control createContents(Composite parent) {
534	Control contents= super.createContents(parent);
535	if (ColoredViewersManager.showColoredLabels()) {
536	if (contents instanceof Composite) {
537	Table listControl= findTableControl((Composite) contents);
538	if (listControl != null) {
539	installOwnerDraw(listControl);
540	}
541	}
542	}
543	return contents;
544	}
545
546	private void installOwnerDraw(Table tableControl) {
547	new OwnerDrawSupport(tableControl) { // installs the owner draw listeners
548	public ColoredString getColoredLabel(Item item) {
549	String text= item.getText();
550	ColoredString str= new ColoredString(text);
551	int index= text.indexOf('-');
552	if (index != -1) {
553	str.setStyle(index, str.length() - index, ColoredJavaElementLabels.QUALIFIER_STYLE);
554	}
555	return str;
556	}
557
558	public Color getColor(String foregroundColorName, Display display) {
559	return PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry().get(foregroundColorName);
560	}
561	};
562	}
563
564	private Table findTableControl(Composite composite) {
565	Control[] children= composite.getChildren();
566	for (int i= 0; i < children.length; i++) {
567	Control curr= children[i];
568	if (curr instanceof Table) {
569	return (Table) curr;
570	} else if (curr instanceof Composite) {
571	Table res= findTableControl((Composite) curr);
572	if (res != null) {
573	return res;
574	}
575	}
576	}
577	return null;
578	}
579
580
581		526
582	/*	527	/*
583	* (non-Javadoc)	528	* (non-Javadoc)
Lines 796-802 Link Here
796	/**	741	/**
797	* A <code>LabelProvider</code> for (the table of) types.	742	* A <code>LabelProvider</code> for (the table of) types.
798	*/	743	*/
799	private class TypeItemLabelProvider extends LabelProvider implements ILabelDecorator {	744	private class TypeItemLabelProvider extends LabelProvider implements ILabelDecorator, IStyledLabelProvider {
800		745
801	private boolean fContainerInfo;	746	private boolean fContainerInfo;
802	private LocalResourceManager fImageManager;	747	private LocalResourceManager fImageManager;
Lines 884-889 Link Here
884	return fTypeInfoUtil.getQualifiedText((TypeNameMatch) element);	829	return fTypeInfoUtil.getQualifiedText((TypeNameMatch) element);
885	}	830	}
886		831
		832	/* (non-Javadoc)
		833	* @see org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider#getStyledText(java.lang.Object)
		834	*/
		835	public StyledString getStyledText(Object element) {
		836	String text= getText(element);
		837	StyledString string= new StyledString(text);
		838	int index= text.indexOf(JavaElementLabels.CONCAT_STRING);
		839	if (index != -1) {
		840	string.setStyle(index, text.length() - index, StyledString.QUALIFIER_STYLE);
		841	}
		842	return string;
		843	}
		844
887	}	845	}
888		846
889	/**	847	/**

Lines 19-28 Link Here

(-)src/org/eclipse/jdt/internal/junit/ui/TestSessionLabelProvider.java (-14 / +11 lines)
19		19
20	import org.eclipse.jface.viewers.LabelProvider;	20	import org.eclipse.jface.viewers.LabelProvider;
21	import org.eclipse.jface.viewers.LabelProviderChangedEvent;	21	import org.eclipse.jface.viewers.LabelProviderChangedEvent;
		22	import org.eclipse.jface.viewers.StyledString;
		23	import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
22		24
23	import org.eclipse.jdt.internal.ui.viewsupport.ColoredJavaElementLabels;	25	import org.eclipse.jdt.internal.ui.viewsupport.ColoredJavaElementLabels;
24	import org.eclipse.jdt.internal.ui.viewsupport.ColoredString;
25	import org.eclipse.jdt.internal.ui.viewsupport.IRichLabelProvider;
26		26
27	import org.eclipse.jdt.junit.model.ITestCaseElement;	27	import org.eclipse.jdt.junit.model.ITestCaseElement;
28	import org.eclipse.jdt.junit.model.ITestElement;	28	import org.eclipse.jdt.junit.model.ITestElement;
Lines 34-40 Link Here
34	import org.eclipse.jdt.internal.junit.model.TestSuiteElement;	34	import org.eclipse.jdt.internal.junit.model.TestSuiteElement;
35	import org.eclipse.jdt.internal.junit.model.TestElement.Status;	35	import org.eclipse.jdt.internal.junit.model.TestElement.Status;
36		36
37	public class TestSessionLabelProvider extends LabelProvider implements IRichLabelProvider {	37	public class TestSessionLabelProvider extends LabelProvider implements IStyledLabelProvider {
38		38
39	private final TestRunnerViewPart fTestRunnerPart;	39	private final TestRunnerViewPart fTestRunnerPart;
40	private final int fLayoutMode;	40	private final int fLayoutMode;
Lines 54-68 Link Here
54	timeFormat.setMinimumIntegerDigits(1);	54	timeFormat.setMinimumIntegerDigits(1);
55	}	55	}
56		56
57	/* (non-Javadoc)	57	public StyledString getStyledText(Object element) {
58	* @see org.eclipse.jdt.internal.ui.viewsupport.IRichLabelProvider#getRichTextLabel(java.lang.Object)
59	*/
60	public ColoredString getRichTextLabel(Object element) {
61	String label= getSimpleLabel(element);	58	String label= getSimpleLabel(element);
62	if (label == null) {	59	if (label == null) {
63	return new ColoredString(element.toString());	60	return new StyledString(element.toString());
64	}	61	}
65	ColoredString text= new ColoredString(label);	62	StyledString text= new StyledString(label);
66		63
67	ITestElement testElement= (ITestElement) element;	64	ITestElement testElement= (ITestElement) element;
68	if (fLayoutMode == TestRunnerViewPart.LAYOUT_HIERARCHICAL) {	65	if (fLayoutMode == TestRunnerViewPart.LAYOUT_HIERARCHICAL) {
Lines 70-76 Link Here
70	String testKindDisplayName= fTestRunnerPart.getTestKindDisplayName();	67	String testKindDisplayName= fTestRunnerPart.getTestKindDisplayName();
71	if (testKindDisplayName != null) {	68	if (testKindDisplayName != null) {
72	String decorated= Messages.format(JUnitMessages.TestSessionLabelProvider_testName_JUnitVersion, new Object[] { label, testKindDisplayName });	69	String decorated= Messages.format(JUnitMessages.TestSessionLabelProvider_testName_JUnitVersion, new Object[] { label, testKindDisplayName });
73	text= ColoredJavaElementLabels.decorateColoredString(text, decorated, ColoredJavaElementLabels.QUALIFIER_STYLE);	70	text= ColoredJavaElementLabels.decorateStyledString(text, decorated, ColoredJavaElementLabels.QUALIFIER_STYLE);
74	}	71	}
75	}	72	}
76		73
Lines 78-93 Link Here
78	if (element instanceof ITestCaseElement) {	75	if (element instanceof ITestCaseElement) {
79	String className= ((ITestCaseElement) element).getTestClassName();	76	String className= ((ITestCaseElement) element).getTestClassName();
80	String decorated= Messages.format(JUnitMessages.TestSessionLabelProvider_testMethodName_className, new Object[] { label, className });	77	String decorated= Messages.format(JUnitMessages.TestSessionLabelProvider_testMethodName_className, new Object[] { label, className });
81	text= ColoredJavaElementLabels.decorateColoredString(text, decorated, ColoredJavaElementLabels.QUALIFIER_STYLE);	78	text= ColoredJavaElementLabels.decorateStyledString(text, decorated, ColoredJavaElementLabels.QUALIFIER_STYLE);
82	}	79	}
83	}	80	}
84	return addElapsedTime(text, testElement.getElapsedTimeInSeconds());	81	return addElapsedTime(text, testElement.getElapsedTimeInSeconds());
85	}	82	}
86		83
87	private ColoredString addElapsedTime(ColoredString coloredString, double time) {	84	private StyledString addElapsedTime(StyledString StyledString, double time) {
88	String string= coloredString.getString();	85	String string= StyledString.getString();
89	String decorated= addElapsedTime(string, time);	86	String decorated= addElapsedTime(string, time);
90	return ColoredJavaElementLabels.decorateColoredString(coloredString, decorated, ColoredJavaElementLabels.COUNTER_STYLE);	87	return ColoredJavaElementLabels.decorateStyledString(StyledString, decorated, ColoredJavaElementLabels.COUNTER_STYLE);
91	}	88	}
92		89
93	private String addElapsedTime(String string, double time) {	90	private String addElapsedTime(String string, double time) {