Attachment #22666 for bug #98771

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

View | Details | Raw Unified | Return to bug 98771
Collapse All | Expand All

Lines 4-10 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/CVSDecoration.java (-13 / +24 lines)
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
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/	10	*******************************************************************************/
Lines 20-25 Link Here
20	import org.eclipse.swt.graphics.*;	20	import org.eclipse.swt.graphics.*;
21	import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation;	21	import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation;
22	import org.eclipse.team.internal.ccvs.core.util.Assert;	22	import org.eclipse.team.internal.ccvs.core.util.Assert;
		23	import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager;
		24	import org.eclipse.team.internal.ccvs.ui.repo.RepositoryRoot;
23	import org.eclipse.team.internal.ui.TeamUIPlugin;	25	import org.eclipse.team.internal.ui.TeamUIPlugin;
24	import org.eclipse.team.ui.ISharedImages;	26	import org.eclipse.team.ui.ISharedImages;
25	import org.eclipse.ui.PlatformUI;	27	import org.eclipse.ui.PlatformUI;
Lines 35-47 Link Here
35	* decoration APIs. As such a client can convert between them using helpers	37	* decoration APIs. As such a client can convert between them using helpers
36	* defined in this class.	38	* defined in this class.
37	* </p>	39	* </p>
38	* TODO:	40	* TODO:
39	* profile	41	* profile
40	* add colors and fonts to preferences instead of being hard coded	42	* add colors and fonts to preferences instead of being hard coded
41	* what to do with CVSDecorationConfiguration class?	43	* what to do with CVSDecorationConfiguration class?
42	* preference page externalizations	44	* preference page externalizations
43	* preference page preview should update when theme changes	45	* preference page preview should update when theme changes
44	*	46	*
45	* @since 3.1	47	* @since 3.1
46	*/	48	*/
47	public class CVSDecoration {	49	public class CVSDecoration {
Lines 53-59 Link Here
53	private Color bkgColor;	55	private Color bkgColor;
54	private Color fgColor;	56	private Color fgColor;
55	private Font font;	57	private Font font;
56		58
57	// Properties	59	// Properties
58	private int resourceType = IResource.FILE;	60	private int resourceType = IResource.FILE;
59	private boolean watchEditEnabled = false;	61	private boolean watchEditEnabled = false;
Lines 78-84 Link Here
78	private String dirtyTextIndicator;	80	private String dirtyTextIndicator;
79	private String addedTextIndicator;	81	private String addedTextIndicator;
80	private String resourceName;	82	private String resourceName;
81		83
82	// Images cached for better performance	84	// Images cached for better performance
83	private static ImageDescriptor dirty;	85	private static ImageDescriptor dirty;
84	private static ImageDescriptor checkedIn;	86	private static ImageDescriptor checkedIn;
Lines 87-93 Link Here
87	private static ImageDescriptor merged;	89	private static ImageDescriptor merged;
88	private static ImageDescriptor newResource;	90	private static ImageDescriptor newResource;
89	private static ImageDescriptor edited;	91	private static ImageDescriptor edited;
90		92
91	// List of preferences used to configure the decorations that	93	// List of preferences used to configure the decorations that
92	// are applied.	94	// are applied.
93	private Preferences preferences;	95	private Preferences preferences;
Lines 131-137 Link Here
131	// TODO: for efficiency don't look up a pref until its needed	133	// TODO: for efficiency don't look up a pref until its needed
132	IPreferenceStore store = getStore();	134	IPreferenceStore store = getStore();
133	Preferences prefs = new Preferences();	135	Preferences prefs = new Preferences();
134		136
135	prefs.setValue(ICVSUIConstants.PREF_SHOW_DIRTY_DECORATION, store.getBoolean(ICVSUIConstants.PREF_SHOW_DIRTY_DECORATION));	137	prefs.setValue(ICVSUIConstants.PREF_SHOW_DIRTY_DECORATION, store.getBoolean(ICVSUIConstants.PREF_SHOW_DIRTY_DECORATION));
136	prefs.setValue(ICVSUIConstants.PREF_SHOW_ADDED_DECORATION, store.getBoolean(ICVSUIConstants.PREF_SHOW_ADDED_DECORATION));	138	prefs.setValue(ICVSUIConstants.PREF_SHOW_ADDED_DECORATION, store.getBoolean(ICVSUIConstants.PREF_SHOW_ADDED_DECORATION));
137	prefs.setValue(ICVSUIConstants.PREF_SHOW_HASREMOTE_DECORATION, store.getBoolean(ICVSUIConstants.PREF_SHOW_HASREMOTE_DECORATION));	139	prefs.setValue(ICVSUIConstants.PREF_SHOW_HASREMOTE_DECORATION, store.getBoolean(ICVSUIConstants.PREF_SHOW_HASREMOTE_DECORATION));
Lines 140-146 Link Here
140	prefs.setValue(ICVSUIConstants.PREF_DIRTY_FLAG, store.getString(ICVSUIConstants.PREF_DIRTY_FLAG));	142	prefs.setValue(ICVSUIConstants.PREF_DIRTY_FLAG, store.getString(ICVSUIConstants.PREF_DIRTY_FLAG));
141	prefs.setValue(ICVSUIConstants.PREF_ADDED_FLAG, store.getString(ICVSUIConstants.PREF_ADDED_FLAG));	143	prefs.setValue(ICVSUIConstants.PREF_ADDED_FLAG, store.getString(ICVSUIConstants.PREF_ADDED_FLAG));
142	prefs.setValue(ICVSUIConstants.PREF_USE_FONT_DECORATORS, store.getString(ICVSUIConstants.PREF_USE_FONT_DECORATORS));	144	prefs.setValue(ICVSUIConstants.PREF_USE_FONT_DECORATORS, store.getString(ICVSUIConstants.PREF_USE_FONT_DECORATORS));
143		145
144	initialize(resourceName, prefs, store.getString(ICVSUIConstants.PREF_FILETEXT_DECORATION), store.getString(ICVSUIConstants.PREF_FOLDERTEXT_DECORATION), store.getString(ICVSUIConstants.PREF_PROJECTTEXT_DECORATION));	146	initialize(resourceName, prefs, store.getString(ICVSUIConstants.PREF_FILETEXT_DECORATION), store.getString(ICVSUIConstants.PREF_FOLDERTEXT_DECORATION), store.getString(ICVSUIConstants.PREF_PROJECTTEXT_DECORATION));
145	}	147	}
146		148
Lines 203-209 Link Here
203	public String getSuffix() {	205	public String getSuffix() {
204	return suffix;	206	return suffix;
205	}	207	}
206		208
207	public void setResourceType(int type) {	209	public void setResourceType(int type) {
208	this.resourceType = type;	210	this.resourceType = type;
209	}	211	}
Lines 247-253 Link Here
247	} else if(isHasRemote()){	249	} else if(isHasRemote()){
248	bindings.put(CVSDecoratorConfiguration.FILE_REVISION, getRevision());	250	bindings.put(CVSDecoratorConfiguration.FILE_REVISION, getRevision());
249	bindings.put(CVSDecoratorConfiguration.RESOURCE_TAG, getTag());	251	bindings.put(CVSDecoratorConfiguration.RESOURCE_TAG, getTag());
250	}	252	}
251	bindings.put(CVSDecoratorConfiguration.RESOURCE_NAME, getResourceName());	253	bindings.put(CVSDecoratorConfiguration.RESOURCE_NAME, getResourceName());
252	bindings.put(CVSDecoratorConfiguration.FILE_KEYWORD, getKeywordSubstitution());	254	bindings.put(CVSDecoratorConfiguration.FILE_KEYWORD, getKeywordSubstitution());
253	if (resourceType != IResource.FILE && location != null) {	255	if (resourceType != IResource.FILE && location != null) {
Lines 256-261 Link Here
256	bindings.put(CVSDecoratorConfiguration.REMOTELOCATION_USER, location.getUsername());	258	bindings.put(CVSDecoratorConfiguration.REMOTELOCATION_USER, location.getUsername());
257	bindings.put(CVSDecoratorConfiguration.REMOTELOCATION_ROOT, location.getRootDirectory());	259	bindings.put(CVSDecoratorConfiguration.REMOTELOCATION_ROOT, location.getRootDirectory());
258	bindings.put(CVSDecoratorConfiguration.REMOTELOCATION_REPOSITORY, repository);	260	bindings.put(CVSDecoratorConfiguration.REMOTELOCATION_REPOSITORY, repository);
		261
		262	RepositoryManager repositoryManager = CVSUIPlugin.getPlugin().getRepositoryManager();
		263	RepositoryRoot root = repositoryManager.getRepositoryRootFor(location);
		264	CVSUIPlugin.getPlugin().getRepositoryManager();
		265	String label = root.getName();
		266	if (label == null) {
		267	label = location.getLocation(true);
		268	}
		269	bindings.put(CVSDecoratorConfiguration.REMOTELOCATION_LABEL, label);
259	}	270	}
260	CVSDecoratorConfiguration.decorate(this, getTextFormatter(), bindings);	271	CVSDecoratorConfiguration.decorate(this, getTextFormatter(), bindings);
261	}	272	}
Lines 286-297 Link Here
286	}	297	}
287	//nothing matched	298	//nothing matched
288	return null;	299	return null;
289	}	300	}
290		301
291	private void computeColorsAndFonts() {	302	private void computeColorsAndFonts() {
292	if (!preferences.getBoolean(ICVSUIConstants.PREF_USE_FONT_DECORATORS))	303	if (!preferences.getBoolean(ICVSUIConstants.PREF_USE_FONT_DECORATORS))
293	return;	304	return;
294		305
295	ITheme current = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme();	306	ITheme current = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme();
296	if(isIgnored()) {	307	if(isIgnored()) {
297	setBackgroundColor(current.getColorRegistry().get(CVSDecoratorConfiguration.IGNORED_BACKGROUND_COLOR));	308	setBackgroundColor(current.getColorRegistry().get(CVSDecoratorConfiguration.IGNORED_BACKGROUND_COLOR));




 * 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
 *******************************************************************************/


public class CVSDecoratorConfiguration {

	// bindings for
	public static final String RESOURCE_NAME = "name"; //$NON-NLS-1$
	public static final String RESOURCE_TAG = "tag"; //$NON-NLS-1$
	public static final String FILE_REVISION = "revision"; //$NON-NLS-1$
	public static final String FILE_KEYWORD = "keyword"; //$NON-NLS-1$

	// bindings for repository location
	public static final String REMOTELOCATION_METHOD = "method"; //$NON-NLS-1$
	public static final String REMOTELOCATION_USER = "user"; //$NON-NLS-1$
	public static final String REMOTELOCATION_HOST = "host"; //$NON-NLS-1$
	public static final String REMOTELOCATION_ROOT = "root"; //$NON-NLS-1$
	public static final String REMOTELOCATION_REPOSITORY = "repository"; //$NON-NLS-1$
	public static final String REMOTELOCATION_LABEL = "label"; //$NON-NLS-1$

	// bindings for resource states
	public static final String DIRTY_FLAG = "dirty_flag"; //$NON-NLS-1$
	public static final String ADDED_FLAG = "added_flag"; //$NON-NLS-1$
	public static final String DEFAULT_DIRTY_FLAG = ">"; //$NON-NLS-1$
	public static final String DEFAULT_ADDED_FLAG = "*"; //$NON-NLS-1$

	// default text decoration formats
	public static final String DEFAULT_FILETEXTFORMAT = "{dirty_flag}{name}  {revision} {tag} ({keyword})"; //$NON-NLS-1$
	public static final String DEFAULT_FOLDERTEXTFORMAT = "{dirty_flag}{name}  {tag}"; //$NON-NLS-1$

	// prefix characters that can be removed if the following binding is not found
	private static final char KEYWORD_SEPCOLON = ':';
	private static final char KEYWORD_SEPAT = '@';

	// font and color definition ids
	public static final String OUTGOING_CHANGE_FOREGROUND_COLOR = "org.eclipse.team.cvs.ui.fontsandcolors.outgoing_change_foreground_color"; //$NON-NLS-1$
	public static final String OUTGOING_CHANGE_BACKGROUND_COLOR = "org.eclipse.team.cvs.ui.fontsandcolors.outgoing_change_background_color"; //$NON-NLS-1$

	public static final String IGNORED_FOREGROUND_COLOR = "org.eclipse.team.cvs.ui.fontsandcolors.ignored_resource_foreground_color"; //$NON-NLS-1$
	public static final String IGNORED_BACKGROUND_COLOR = "org.eclipse.team.cvs.ui.fontsandcolors.ignored_resource_background_color"; //$NON-NLS-1$
	public static final String IGNORED_FONT = "org.eclipse.team.cvs.ui.fontsandcolors.ignored_resource_font"; //$NON-NLS-1$

	public static void decorate(CVSDecoration decoration, String format, Map bindings) {
		StringBuffer prefix = new StringBuffer(80);
		StringBuffer suffix = new StringBuffer(80);
		StringBuffer output = prefix;

		int length = format.length();
		int start = -1;
		int end = length;

					String key = format.substring(end + 1, start);
					String s;

					//We use the RESOURCE_NAME key to determine if we are doing the prefix or suffix.  The name isn't actually part of either.
					if(key.equals(RESOURCE_NAME)) {
						output = suffix;
						s = null;

						if(curLength>0) {
							char c = output.charAt(curLength - 1);
							if(c == KEYWORD_SEPCOLON || c == KEYWORD_SEPAT) {
								output.deleteCharAt(curLength - 1);
							}
						}
					}

				break;
			}
		}

		if (prefix.length() != 0) {
			decoration.addPrefix(prefix.toString());
		}




 * 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
 *******************************************************************************/

public class CVSDecoratorPreferencesPage extends PreferencePage implements IWorkbenchPreferencePage {

	private static class PreviewFile {

		public final String name, tag, mode;
		public final int type;
		public final boolean added, dirty, hasRemote, ignored, newResource;
		public Collection children;

		public PreviewFile(String name, int type, boolean added, boolean newResource, boolean dirty, boolean ignored, boolean hasRemote, String mode, String tag)  {
			this.name= name;
			this.type= type;

			this.tag= tag != null ? tag : ""; //$NON-NLS-1$
			this.children= Collections.EMPTY_LIST;
		}

		public void configureDecoration(CVSDecoration decoration) {
			decoration.setResourceType(type);
			decoration.setAdded(added);

			decoration.setKeywordSubstitution(mode);
		}
	}

	private static class FormatEditor extends SelectionAdapter {
		private final Text fText;
		private final Map fBindings;
		private final String fKey;

		public FormatEditor(Composite composite, String title, String buttonText, Map bindings, String key) {

			fKey= key;
			fBindings= bindings;

			final Label label= SWTUtils.createLabel(composite, title);
			label.setLayoutData(SWTUtils.createGridData(SWT.DEFAULT, SWT.DEFAULT, false, false));

			fText= SWTUtils.createText(composite);

			final Button button = new Button(composite, SWT.NONE);
			button.setText(buttonText);
			button.setLayoutData(new GridData());

			button.addSelectionListener(this);
		}

		public void addModifyListener(ModifyListener listener) {
			fText.addModifyListener(listener);
		}

		public String getText() {
			return fText.getText();
		}

		public void widgetSelected(SelectionEvent e) {

			final ILabelProvider labelProvider = new LabelProvider() {
				public String getText(Object element) {
					return ((Map.Entry)element).getKey() + " - " + ((Map.Entry)element).getValue(); //$NON-NLS-1$
				}
			};

			final IStructuredContentProvider contentsProvider = new IStructuredContentProvider() {
				public Object[] getElements(Object inputElement) {
					return ((Collection)inputElement).toArray();

				public void dispose() {}
				public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
			};

			final ListSelectionDialog dialog= new ListSelectionDialog(
					fText.getShell(),
					fBindings.entrySet(),

			dialog.setTitle(CVSUIMessages.CVSDecoratorPreferencesPage_1);  //$NON-NLS-1$
			if (dialog.open() != Window.OK)
				return;

			Object[] result = dialog.getResult();

			for (int i = 0; i < result.length; i++) {
				fText.insert("{"+((Map.Entry)result[i]).getKey() +"}");   //$NON-NLS-1$ //$NON-NLS-2$
			}
		}

		public void performOk(IPreferenceStore store) {
			store.setValue(fKey, fText.getText());
		}

		public void performDefaults(IPreferenceStore store) {
			store.setToDefault(fKey);
			fText.setText(store.getDefaultString(fKey));

			fText.setText(store.getString(fKey));
		}
	}

	private abstract class Tab extends Observable {

		public abstract void initializeValues(IPreferenceStore store);
		public abstract void performDefaults(IPreferenceStore store);
		public abstract void performOk(IPreferenceStore store);

	}

	private class IconDecoratorTab extends Tab implements SelectionListener {

		private final Button fDirty, fHasRemote, fAdded, fNewResource;

		public IconDecoratorTab(TabFolder parent) {

			final Composite composite= SWTUtils.createHFillComposite(parent, SWTUtils.MARGINS_DEFAULT);

			fDirty= SWTUtils.createCheckBox(composite, CVSUIMessages.CVSDecoratorPreferencesPage_2); //$NON-NLS-1$
			fDirty.addSelectionListener(this);

			fHasRemote= SWTUtils.createCheckBox(composite, CVSUIMessages.CVSDecoratorPreferencesPage_3); //$NON-NLS-1$
			fHasRemote.addSelectionListener(this);

			fAdded= SWTUtils.createCheckBox(composite, CVSUIMessages.CVSDecoratorPreferencesPage_4); //$NON-NLS-1$
			fAdded.addSelectionListener(this);

			fNewResource= SWTUtils.createCheckBox(composite, CVSUIMessages.CVSDecoratorPreferencesPage_5); //$NON-NLS-1$
			fNewResource.addSelectionListener(this);

			final TabItem item= new TabItem(parent, SWT.NONE);
			item.setText(CVSUIMessages.CVSDecoratorPreferencesPage_6);		 //$NON-NLS-1$
			item.setControl(composite);
		}

		public void widgetSelected(SelectionEvent e) {
			setChanged();
			notifyObservers();
		}

		public void initializeValues(IPreferenceStore store) {
			fDirty.setSelection(store.getBoolean(ICVSUIConstants.PREF_SHOW_DIRTY_DECORATION));
			fAdded.setSelection(store.getBoolean(ICVSUIConstants.PREF_SHOW_ADDED_DECORATION));
			fHasRemote.setSelection(store.getBoolean(ICVSUIConstants.PREF_SHOW_HASREMOTE_DECORATION));
			fNewResource.setSelection(store.getBoolean(ICVSUIConstants.PREF_SHOW_NEWRESOURCE_DECORATION));
		}

		public void performOk(IPreferenceStore store) {
			store.setValue(ICVSUIConstants.PREF_SHOW_DIRTY_DECORATION, fDirty.getSelection());
			store.setValue(ICVSUIConstants.PREF_SHOW_ADDED_DECORATION, fAdded.getSelection());
			store.setValue(ICVSUIConstants.PREF_SHOW_HASREMOTE_DECORATION, fHasRemote.getSelection());
			store.setValue(ICVSUIConstants.PREF_SHOW_NEWRESOURCE_DECORATION, fNewResource.getSelection());
		}

		public void performDefaults(IPreferenceStore store) {
			fDirty.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_SHOW_DIRTY_DECORATION));
			fAdded.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_SHOW_ADDED_DECORATION));
			fHasRemote.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_SHOW_HASREMOTE_DECORATION));
			fNewResource.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_SHOW_NEWRESOURCE_DECORATION));
		}

		public void setPreferences(Preferences prefs) {
			prefs.setDefault(ICVSUIConstants.PREF_SHOW_DIRTY_DECORATION, fDirty.getSelection());
			prefs.setDefault(ICVSUIConstants.PREF_SHOW_ADDED_DECORATION, fAdded.getSelection());


		public void widgetDefaultSelected(SelectionEvent e) {
		}
	}

	private class TextDecoratorTab extends Tab implements ModifyListener {

		private final FormatEditor fFileDecoration;
		private final FormatEditor fFolderDecoration;
		private final FormatEditor fProjectDecoration;

		private final Text dirtyFlag;
		private final Text addedFlag;

		public TextDecoratorTab(TabFolder parent) {

			final Composite composite= SWTUtils.createHFillComposite(parent, SWTUtils.MARGINS_DEFAULT, 3);
			Dialog.applyDialogFont(composite);

			fFileDecoration= new FormatEditor(composite, CVSUIMessages.CVSDecoratorPreferencesPage_7, CVSUIMessages.CVSDecoratorPreferencesPage_8, BINDINGS, ICVSUIConstants.PREF_FILETEXT_DECORATION);   //$NON-NLS-1$ //$NON-NLS-2$
			fFolderDecoration= new FormatEditor(composite, CVSUIMessages.CVSDecoratorPreferencesPage_9, CVSUIMessages.CVSDecoratorPreferencesPage_10, FOLDER_BINDINGS, ICVSUIConstants.PREF_FOLDERTEXT_DECORATION);   //$NON-NLS-1$ //$NON-NLS-2$
			fProjectDecoration= new FormatEditor(composite, CVSUIMessages.CVSDecoratorPreferencesPage_11, CVSUIMessages.CVSDecoratorPreferencesPage_12, FOLDER_BINDINGS, ICVSUIConstants.PREF_PROJECTTEXT_DECORATION); //$NON-NLS-1$ //$NON-NLS-2$

			fFileDecoration.addModifyListener(this);
			fFolderDecoration.addModifyListener(this);
			fProjectDecoration.addModifyListener(this);

			SWTUtils.createPlaceholder(composite, 1, 3);
			final Label dirtyLabel= SWTUtils.createLabel(composite, CVSUIMessages.CVSDecoratorPreferencesPage_13, 1); //$NON-NLS-1$
			dirtyLabel.setLayoutData(new GridData());

			dirtyFlag = new Text(composite, SWT.BORDER);
			dirtyFlag.setLayoutData(SWTUtils.createHFillGridData(1));
			dirtyFlag.addModifyListener(this);
			SWTUtils.createPlaceholder(composite, 1, 1);


			final Label addedLabel= SWTUtils.createLabel(composite, CVSUIMessages.CVSDecoratorPreferencesPage_14, 1); //$NON-NLS-1$
			addedLabel.setLayoutData(new GridData());

			addedFlag.setLayoutData(SWTUtils.createHFillGridData(1));
			addedFlag.addModifyListener(this);
			SWTUtils.createPlaceholder(composite, 1, 1);

			SWTUtils.createPlaceholder(composite, 1, 3);

			final TabItem item= new TabItem(parent, SWT.NONE);
			item.setText(CVSUIMessages.CVSDecoratorPreferencesPage_15);		 //$NON-NLS-1$
			item.setControl(composite);
		}

		public void initializeValues(IPreferenceStore store) {
			fFileDecoration.initializeValue(store);
			fFolderDecoration.initializeValue(store);

			addedFlag.setText(store.getString(ICVSUIConstants.PREF_ADDED_FLAG));
			dirtyFlag.setText(store.getString(ICVSUIConstants.PREF_DIRTY_FLAG));
		}

		public void performOk(IPreferenceStore store) {
			fFileDecoration.performOk(store);
			fFolderDecoration.performOk(store);

			store.setValue(ICVSUIConstants.PREF_ADDED_FLAG, addedFlag.getText());
			store.setValue(ICVSUIConstants.PREF_DIRTY_FLAG, dirtyFlag.getText());
		}

		public void performDefaults(IPreferenceStore store) {
			fFileDecoration.performDefaults(store);
			fFolderDecoration.performDefaults(store);
			fProjectDecoration.performDefaults(store);

			addedFlag.setText(store.getDefaultString(ICVSUIConstants.PREF_ADDED_FLAG));
			dirtyFlag.setText(store.getDefaultString(ICVSUIConstants.PREF_DIRTY_FLAG));
		}

			prefs.setDefault(ICVSUIConstants.PREF_ADDED_FLAG, addedFlag.getText());
		}
	}

	private class GeneralTab extends Tab implements SelectionListener {
		private final Button fShowDirty;
		private final Button fUseFontDecorations;

		public GeneralTab(TabFolder parent) {
			final Composite composite= SWTUtils.createHFillComposite(parent, SWTUtils.MARGINS_DEFAULT);
			Dialog.applyDialogFont(composite);

            SWTUtils.createPreferenceLink((IWorkbenchPreferenceContainer) getContainer(), composite, CVSUIMessages.CVSDecoratorPreferencesPage_36, CVSUIMessages.CVSDecoratorPreferencesPage_37); //$NON-NLS-1$ //$NON-NLS-2$

			fShowDirty= SWTUtils.createCheckBox(composite, CVSUIMessages.CVSDecoratorPreferencesPage_16); //$NON-NLS-1$
			SWTUtils.createLabel(composite, CVSUIMessages.CVSDecoratorPreferencesPage_17); //$NON-NLS-1$

			fUseFontDecorations= SWTUtils.createCheckBox(composite, CVSUIMessages.CVSDecoratorPreferencesPage_18); //$NON-NLS-1$

			SWTUtils.createPreferenceLink((IWorkbenchPreferenceContainer) getContainer(), composite, CVSUIMessages.CVSDecoratorPreferencesPage_19, CVSUIMessages.CVSDecoratorPreferencesPage_20); //$NON-NLS-1$ //$NON-NLS-2$


			final TabItem item= new TabItem(parent, SWT.NONE);
			item.setText(CVSUIMessages.CVSDecoratorPreferencesPage_21);		 //$NON-NLS-1$
			item.setControl(composite);
		}

		public void widgetSelected(SelectionEvent e) {
			setChanged();
			notifyObservers();
		}

		public void widgetDefaultSelected(SelectionEvent e) {
		}


			fShowDirty.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_CALCULATE_DIRTY));
			fUseFontDecorations.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_USE_FONT_DECORATORS));
		}

		public void performOk(IPreferenceStore store) {
			store.setValue(ICVSUIConstants.PREF_CALCULATE_DIRTY, fShowDirty.getSelection());
			store.setValue(ICVSUIConstants.PREF_USE_FONT_DECORATORS, fUseFontDecorations.getSelection());
		}

		public void setPreferences(Preferences preferences) {
			preferences.setValue(ICVSUIConstants.PREF_CALCULATE_DIRTY, fShowDirty.getSelection());
			preferences.setValue(ICVSUIConstants.PREF_USE_FONT_DECORATORS, fUseFontDecorations.getSelection());
		}
	}

	public class Preview extends LabelProvider implements Observer, ITreeContentProvider {

		private final ResourceManager fImageCache;
		private final TreeViewer fViewer;

		public Preview(Composite composite) {
            SWTUtils.createLabel(composite, "Previe&w:");

			fViewer.setInput(ROOT);
			fViewer.expandAll();
		}

		public void refresh() {
			fViewer.refresh(true);
		}

		public void update(Observable o, Object arg) {
			refresh();
		}

		public Object[] getChildren(Object parentElement) {
			return ((PreviewFile)parentElement).children.toArray();
		}

		public Color getBackground(Object element) {
			return getDecoration(element).getBackgroundColor();
		}

		public Color getForeground(Object element) {
			return getDecoration(element).getForegroundColor();
		}

		public Font getFont(Object element) {
			return getDecoration(element).getFont();
		}

		public String getText(Object element) {
			final CVSDecoration decoration = getDecoration(element);
			final StringBuffer buffer = new StringBuffer();

				buffer.append(suffix);
			return buffer.toString();
		}

		public CVSDecoration getDecoration(Object element) {
			final CVSDecoration decoration = buildDecoration((PreviewFile)element);
			((PreviewFile)element).configureDecoration(decoration);
			decoration.compute();
			return decoration;
		}

		public Image getImage(Object element) {
			final String s;
			switch (((PreviewFile)element).type) {

            return null;
		}
	}

	private static class ThemeListener implements IPropertyChangeListener {

		private final Preview fPreview;

		ThemeListener(Preview preview) {
			fPreview= preview;
		}

			fPreview.refresh();
		}
	}

	protected static final Collection ROOT;
	protected static final Map BINDINGS;
	protected static final Map FOLDER_BINDINGS;

		BINDINGS.put(CVSDecoratorConfiguration.FILE_REVISION, CVSUIMessages.CVSDecoratorPreferencesPage_25);  //$NON-NLS-1$
		BINDINGS.put(CVSDecoratorConfiguration.DIRTY_FLAG, CVSUIMessages.CVSDecoratorPreferencesPage_26);  //$NON-NLS-1$
		BINDINGS.put(CVSDecoratorConfiguration.ADDED_FLAG, CVSUIMessages.CVSDecoratorPreferencesPage_27); //$NON-NLS-1$

		FOLDER_BINDINGS= new HashMap();
		FOLDER_BINDINGS.put(CVSDecoratorConfiguration.RESOURCE_NAME, CVSUIMessages.CVSDecoratorPreferencesPage_28);  //$NON-NLS-1$
		FOLDER_BINDINGS.put(CVSDecoratorConfiguration.RESOURCE_TAG, CVSUIMessages.CVSDecoratorPreferencesPage_29);  //$NON-NLS-1$

		FOLDER_BINDINGS.put(CVSDecoratorConfiguration.REMOTELOCATION_USER, CVSUIMessages.CVSDecoratorPreferencesPage_32);  //$NON-NLS-1$
		FOLDER_BINDINGS.put(CVSDecoratorConfiguration.REMOTELOCATION_ROOT, CVSUIMessages.CVSDecoratorPreferencesPage_33);  //$NON-NLS-1$
		FOLDER_BINDINGS.put(CVSDecoratorConfiguration.REMOTELOCATION_REPOSITORY, CVSUIMessages.CVSDecoratorPreferencesPage_34);  //$NON-NLS-1$
		FOLDER_BINDINGS.put(CVSDecoratorConfiguration.REMOTELOCATION_LABEL, CVSUIMessages.CVSDecoratorPreferencesPage_38);  //$NON-NLS-1$
		FOLDER_BINDINGS.put(CVSDecoratorConfiguration.DIRTY_FLAG, CVSUIMessages.CVSDecoratorPreferencesPage_35); //$NON-NLS-1$

		final PreviewFile project= new PreviewFile("Project", IResource.PROJECT, false, false, false, false, true, null, "v1_0"); //$NON-NLS-1$ //$NON-NLS-2$
		final ArrayList children= new ArrayList();
		children.add(new PreviewFile("Folder", IResource.FOLDER, false, false, false, false, true, null, null)); //$NON-NLS-1$

		ROOT= Collections.singleton(project);
	}


	private TextDecoratorTab fTextTab;
	private IconDecoratorTab fIconTab;
	private GeneralTab fGeneralTab;

	private Preview fPreview;
	private ThemeListener fThemeListener;

	protected Control createContents(Composite parent) {

		final Composite composite= SWTUtils.createHVFillComposite(parent, SWTUtils.MARGINS_NONE);

		final Composite folderComposite= SWTUtils.createHFillComposite(composite, SWTUtils.MARGINS_NONE);

		// create a tab folder for the page
		final TabFolder tabFolder = new TabFolder(folderComposite, SWT.NONE);
		tabFolder.setLayout(new TabFolderLayout());
		tabFolder.setLayoutData(SWTUtils.createHFillGridData());

		// text decoration options
		fGeneralTab= new GeneralTab(tabFolder);
		fTextTab= new TextDecoratorTab(tabFolder);
		fIconTab= new IconDecoratorTab(tabFolder);

		fPreview= new Preview(composite);

		fTextTab.addObserver(fPreview);
		fIconTab.addObserver(fPreview);
		fGeneralTab.addObserver(fPreview);

		initializeValues();
        PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.DECORATORS_PREFERENCE_PAGE);
		Dialog.applyDialogFont(parent);

		PlatformUI.getWorkbench().getThemeManager().addPropertyChangeListener(fThemeListener= new ThemeListener(fPreview));

		return tabFolder;
	}

	public void dispose() {
		if (fThemeListener != null)
			PlatformUI.getWorkbench().getThemeManager().removePropertyChangeListener(fThemeListener);
        if (fPreview != null)
            fPreview.dispose();
	}

	/**
	 * Initializes states of the controls from the preference store.
	 */

	 */
	protected void performDefaults() {
		final IPreferenceStore store = getPreferenceStore();

		fTextTab.performDefaults(store);
		fIconTab.performDefaults(store);
		fGeneralTab.performDefaults(store);

	protected IPreferenceStore doGetPreferenceStore() {
		return CVSUIPlugin.getPlugin().getPreferenceStore();
	}


	public CVSDecoration buildDecoration(PreviewFile file) {
		final Preferences prefs = new Preferences();

		fIconTab.setPreferences(prefs);
		fTextTab.setPreferences(prefs);
		fGeneralTab.setPreferences(prefs);

		final CVSDecoration decoration= new CVSDecoration(file.name, prefs, fTextTab.getFileTextFormat(), fTextTab.getFolderTextFormat(), fTextTab.getProjectTextFormat());

		decoration.setKeywordSubstitution(Command.KSUBST_TEXT.getShortDisplayText());
		decoration.setRevision("1.45");  //$NON-NLS-1$
		try {

Lines 137-142 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/messages.properties (+1 lines)
137	CVSDecoratorPreferencesPage_35=flag indicating that the folder has a child resource with outgoing changes	137	CVSDecoratorPreferencesPage_35=flag indicating that the folder has a child resource with outgoing changes
138	CVSDecoratorPreferencesPage_36=org.eclipse.ui.preferencePages.Decorators	138	CVSDecoratorPreferencesPage_36=org.eclipse.ui.preferencePages.Decorators
139	CVSDecoratorPreferencesPage_37=See <a>''{0}''</a> to enable CVS decorations.	139	CVSDecoratorPreferencesPage_37=See <a>''{0}''</a> to enable CVS decorations.
		140	CVSDecoratorPreferencesPage_38=the repository label
140		141
141		142
142	CVSFilePropertiesPage_ignored=The file is ignored by CVS.	143	CVSFilePropertiesPage_ignored=The file is ignored by CVS.

Return to bug 98771

Lines 3-10 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java (-2 / +3 lines)
3	* program and the accompanying materials are made available under the terms of	3	* program and the accompanying materials are made available under the terms of
4	* the Eclipse Public License v1.0 which accompanies this distribution, and is	4	* the Eclipse Public License v1.0 which accompanies this distribution, and is
5	* available at http://www.eclipse.org/legal/epl-v10.html	5	* available at http://www.eclipse.org/legal/epl-v10.html
6	*	6	*
7	* Contributors:	7	* Contributors:
8	* IBM - Initial API and implementation	8	* IBM - Initial API and implementation
9	**********************************************************************/	9	**********************************************************************/
10	package org.eclipse.team.internal.ccvs.ui;	10	package org.eclipse.team.internal.ccvs.ui;
Lines 146-151 Link Here
146	public static String CVSDecoratorPreferencesPage_35;	146	public static String CVSDecoratorPreferencesPage_35;
147	public static String CVSDecoratorPreferencesPage_36;	147	public static String CVSDecoratorPreferencesPage_36;
148	public static String CVSDecoratorPreferencesPage_37;	148	public static String CVSDecoratorPreferencesPage_37;
		149	public static String CVSDecoratorPreferencesPage_38; // repository label
149		150
150	public static String CVSFilePropertiesPage_ignored;	151	public static String CVSFilePropertiesPage_ignored;
151	public static String CVSFilePropertiesPage_notManaged;	152	public static String CVSFilePropertiesPage_notManaged;