Attachment #160332 for bug #303731

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 303731
Collapse All | Expand All

Lines 1-11 Link Here

(-)src/org/eclipse/ui/forms/IManagedForm.java (-6 / +8 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2003, 2007 IBM Corporation and others.	2	* Copyright (c) 2003, 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
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	*******************************************************************************/
11	package org.eclipse.ui.forms;	11	package org.eclipse.ui.forms;
Lines 28-33 Link Here
28	*	28	*
29	* @see ManagedForm	29	* @see ManagedForm
30	* @since 1.0	30	* @since 1.0
		31	* @noimplement This interface is not intended to be implemented by clients.
		32	* @noextend This interface is not intended to be extended by clients.
31	*/	33	*/
32	public interface IManagedForm {	34	public interface IManagedForm {
33	/**	35	/**




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

 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Roland Tepp (roland@videobet.com) - patch (see Bugzilla #107197) 
 *******************************************************************************/
package org.eclipse.ui.forms;


	 */
	public void createContent(IManagedForm managedForm) {
		final ScrolledForm form = managedForm.getForm();
		createContent(managedForm, form.getBody());
	}
	
	/**
	 * Creates the content of the master/details block inside the parent composite.
	 * This method should be called as late as possible inside the parent part.
	 * 
	 * @param managedForm
	 *            the managed form to create the block in
	 */
	public void createContent(IManagedForm managedForm, Composite parent) {
		final ScrolledForm form = managedForm.getForm();
		FormToolkit toolkit = managedForm.getToolkit();
		applyLayout(parent);
		sashForm = new MDSashForm(parent, SWT.NULL);
		layout.marginHeight = 0;
		form.getBody().setLayout(layout);
		sashForm = new MDSashForm(form.getBody(), SWT.NULL);
		sashForm.setData("form", managedForm); //$NON-NLS-1$
		toolkit.adapt(sashForm, false, false);
		sashForm.setMenu(parent.getMenu());
		applyLayoutData(sashForm);
		createMasterPart(managedForm, sashForm);
		createDetailsPart(managedForm, sashForm);
		hookResizeListener();

		form.updateToolBar();
	}
	
	/**
	 * Applies layout data to the sash form containing master and detail parts
	 * of the master/details block.
	 * 
	 * <p>The default implementation fills the whole parent composite area.
	 * Override this method if master/details block is to be placed on a form
	 * along with other components.</p>
	 * 
	 * <p>Implementations that override this method should also override 
	 * <code>applyLayout(Composite)</code> method implementation.</p>
	 * 
	 * @param sashForm The sash form to be laid out on the parent composite.
	 * @see #applyLayout(Composite)
	 */
	protected void applyLayoutData(SashForm sashForm) {
		sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
	}

	/**
	 * Applies layout to the parent composite of the master/details block.
	 * 
	 * <p>The default implementation fills the whole parent composite area.
	 * Override this method if master/details block is to be placed on a form
	 * along with other components.</p>
	 * 
	 * <p>Implementations that override this method should also override 
	 * <code>applyLayoutData(SashForm)</code> method implementation.</p>
	 * 
	 * @param parent parent composite for the master/details block
	 * @see #applyLayoutData(SashForm)
	 */
	protected void applyLayout(final Composite parent) {
		GridLayout layout = new GridLayout();
		layout.marginWidth = 0;
		layout.marginHeight = 0;
		parent.setLayout(layout);
	}
	
	private void hookResizeListener() {
		Listener listener = ((MDSashForm)sashForm).listener;
		Control [] children = sashForm.getChildren();

Lines 1-5 Link Here

(-)src/org/eclipse/ui/forms/FormColors.java (-17 / +24 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-19 Link Here
14	import java.util.Map;	14	import java.util.Map;
15		15
16	import org.eclipse.rwt.graphics.Graphics;	16	import org.eclipse.rwt.graphics.Graphics;
		17
		18	import org.eclipse.jface.resource.JFaceResources;
		19	import org.eclipse.jface.resource.LocalResourceManager;
17	import org.eclipse.swt.SWT;	20	import org.eclipse.swt.SWT;
18	import org.eclipse.swt.graphics.Color;	21	import org.eclipse.swt.graphics.Color;
19	import org.eclipse.swt.graphics.RGB;	22	import org.eclipse.swt.graphics.RGB;
Lines 94-99 Link Here
94		97
95	protected Map colorRegistry = new HashMap(10);	98	protected Map colorRegistry = new HashMap(10);
96		99
		100	private LocalResourceManager resources;
		101
97	protected Color background;	102	protected Color background;
98		103
99	protected Color foreground;	104	protected Color foreground;
Lines 206-212 Link Here
206	* @return the allocated color object	211	* @return the allocated color object
207	*/	212	*/
208	public Color createColor(String key, RGB rgb) {	213	public Color createColor(String key, RGB rgb) {
209	return createColor(key, rgb.red, rgb.green, rgb.blue);	214	// RAP [rh] changes due to missing Color constructor
		215	// Color c = getResourceManager().createColor(rgb);
		216	// Color prevC = (Color) colorRegistry.get(key);
		217	// if (prevC != null && !prevC.isDisposed())
		218	// getResourceManager().destroyColor(prevC.getRGB());
		219	Color c = Graphics.getColor(rgb);
		220	colorRegistry.put(key, c);
		221	return c;
210	}	222	}
211		223
212	/**	224	/**
Lines 249-265 Link Here
249	* @return the allocated color object	261	* @return the allocated color object
250	*/	262	*/
251	public Color createColor(String key, int r, int g, int b) {	263	public Color createColor(String key, int r, int g, int b) {
252	// RAP [rh] changes due to missing Color constructor	264	return createColor(key, new RGB(r,g,b));
253	// Color c = new Color(display, r, g, b);
254	// Color prevC = (Color) colorRegistry.get(key);
255	// if (prevC != null)
256	// prevC.dispose();
257	// colorRegistry.put(key, c);
258
259	Color c = Graphics.getColor(r, g, b);
260	colorRegistry.put(key, c);
261
262	return c;
263	}	265	}
264		266
265	/**	267	/**
Lines 365-374 Link Here
365	* Disposes all the colors in the registry.	367	* Disposes all the colors in the registry.
366	*/	368	*/
367	public void dispose() {	369	public void dispose() {
368	// RAP [rh] changes due to missing Color#dispose()	370	if (resources != null)
369	// Iterator e = colorRegistry.values().iterator();	371	resources.dispose();
370	// while (e.hasNext())	372	resources = null;
371	// ((Color) e.next()).dispose();
372	colorRegistry = null;	373	colorRegistry = null;
373	}	374	}
374		375
Lines 730-733 Link Here
730	createColor(IFormColors.H_HOVER_LIGHT, light);	731	createColor(IFormColors.H_HOVER_LIGHT, light);
731	createColor(IFormColors.H_HOVER_FULL, full);	732	createColor(IFormColors.H_HOVER_FULL, full);
732	}	733	}
		734
		735	private LocalResourceManager getResourceManager() {
		736	if (resources == null)
		737	resources = new LocalResourceManager(JFaceResources.getResources());
		738	return resources;
		739	}
733	}	740	}

Lines 12-17 Link Here

(-)src/org/eclipse/ui/forms/HyperlinkGroup.java (-7 / +8 lines)
12		12
13	import java.util.ArrayList;	13	import java.util.ArrayList;
14		14
		15	import org.eclipse.ui.forms.internal.widgets.IHyperlinkAdapter;
		16
15	import org.eclipse.swt.SWT;	17	import org.eclipse.swt.SWT;
16	import org.eclipse.swt.graphics.Color;	18	import org.eclipse.swt.graphics.Color;
17	import org.eclipse.swt.widgets.Display;	19	import org.eclipse.swt.widgets.Display;
Lines 19-25 Link Here
19	import org.eclipse.swt.widgets.Listener;	21	import org.eclipse.swt.widgets.Listener;
20	import org.eclipse.ui.forms.events.HyperlinkEvent;	22	import org.eclipse.ui.forms.events.HyperlinkEvent;
21	import org.eclipse.ui.forms.events.IHyperlinkListener;	23	import org.eclipse.ui.forms.events.IHyperlinkListener;
22	import org.eclipse.ui.forms.internal.widgets.IHyperlinkAdapter;
23	import org.eclipse.ui.forms.widgets.Hyperlink;	24	import org.eclipse.ui.forms.widgets.Hyperlink;
24		25
25	/**	26	/**
Lines 143-150 Link Here
143	if (getHyperlinkUnderlineMode() == UNDERLINE_ALWAYS)	144	if (getHyperlinkUnderlineMode() == UNDERLINE_ALWAYS)
144	link.setUnderlined(true);	145	link.setUnderlined(true);
145	hook(link);	146	hook(link);
146	// RAP [rh] Provides information to handle hover effect on the client-side	147	// RAP [rh] Provides information to handle hover effect on the client-side
147	updateHyperlinkSettings();	148	updateHyperlinkSettings();
148	}	149	}
149		150
150	/**	151	/**
Lines 157-164 Link Here
157	super.setActiveBackground(newActiveBackground);	158	super.setActiveBackground(newActiveBackground);
158	// RAP [rh] Obsolete, as mouse events are missing	159	// RAP [rh] Obsolete, as mouse events are missing
159	// isActiveBackgroundSet = true;	160	// isActiveBackgroundSet = true;
160	// RAP [rh] Provides information to handle hover effect on the client-side	161	// RAP [rh] Provides information to handle hover effect on the client-side
161	updateHyperlinkSettings();	162	updateHyperlinkSettings();
162	}	163	}
163		164
164	/**	165	/**
Lines 171-178 Link Here
171	super.setActiveForeground(newActiveForeground);	172	super.setActiveForeground(newActiveForeground);
172	// RAP [rh] Obsolete, as mouse events are missing	173	// RAP [rh] Obsolete, as mouse events are missing
173	// isActiveForegroundSet = true;	174	// isActiveForegroundSet = true;
174	// RAP [rh] Provides information to handle hover effect on the client-side	175	// RAP [rh] Provides information to handle hover effect on the client-side
175	updateHyperlinkSettings();	176	updateHyperlinkSettings();
176	}	177	}
177		178
178	// RAP [rh] Update information to handle hover effect on the client-side	179	// RAP [rh] Update information to handle hover effect on the client-side




/*******************************************************************************
 *  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.ui.forms;

import org.eclipse.ui.internal.forms.widgets.*;
/**
 * Manages color and underline mode settings for a group of hyperlinks. The
 * class is extended by HyperlinkGroup but is otherwise not intended to be
 * subclassed.
 *
 * @since 1.0
 * @noextend This class is not intended to be subclassed by clients.
 */
public class HyperlinkSettings {
	/**

Lines 1-5 Link Here

(-)src/org/eclipse/ui/forms/DetailsPart.java (-4 / +1 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2006 IBM Corporation and others.	2	* Copyright (c) 2000, 2009 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 65-73 Link Here
65	page.dispose();	65	page.dispose();
66	page=null;	66	page=null;
67	}	67	}
68	public boolean isDisposed() {
69	return page==null;
70	}
71	public boolean isFixed() {	68	public boolean isFixed() {
72	return fixed;	69	return fixed;
73	}	70	}

Lines 1-5 Link Here

(-)src/org/eclipse/ui/forms/IMessageManager.java (-2 / +4 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2007 IBM Corporation and others.	2	* Copyright (c) 2007, 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 7-13 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	******************************************************************************/	10	*******************************************************************************/
11		11
12	package org.eclipse.ui.forms;	12	package org.eclipse.ui.forms;
13		13
Lines 48-53 Link Here
48	* @since 1.0	48	* @since 1.0
49	* @see IMessageProvider	49	* @see IMessageProvider
50	* @see IManagedForm	50	* @see IManagedForm
		51	* @noimplement This interface is not intended to be implemented by clients.
		52	* @noextend This interface is not intended to be extended by clients.
51	*/	53	*/
52		54
53	public interface IMessageManager {	55	public interface IMessageManager {




/*******************************************************************************
 * 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 java.util.Vector;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.ScrolledForm;

/**
 * Managed form wraps a form widget and adds life cycle methods for form parts.


	private boolean initialized;

	private MessageManager messageManager;

	private Vector parts = new Vector();

	/**

	 * @see org.eclipse.ui.forms.IManagedForm#getMessageManager()
	 */
	public IMessageManager getMessageManager() {
		return form.getMessageManager();
			messageManager = new MessageManager(form);
		return messageManager;
	}
}

Lines 1-5 Link Here

(-)src/org/eclipse/ui/forms/widgets/AbstractHyperlink.java (-4 / +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 7-12 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Izzet Safer (isafer@ca.ibm.com) - patch (see Bugzilla #250505)
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.ui.forms.widgets;	12	package org.eclipse.ui.forms.widgets;
12		13
Lines 31-36 Link Here
31	* processing mouse and keyboard events, and converting them into unified	32	* processing mouse and keyboard events, and converting them into unified
32	* hyperlink events. Subclasses are responsible for rendering the hyperlink in	33	* hyperlink events. Subclasses are responsible for rendering the hyperlink in
33	* the client area.	34	* the client area.
		35	* <p>
		36	* <dl>
		37	* <dt><b>Styles:</b></dt>
		38	* <dd>None</dd>
		39	* </dl>
34	*	40	*
35	* @since 1.0	41	* @since 1.0
36	*/	42	*/
Lines 227-234 Link Here
227	// disarm link, back to normal state	233	// disarm link, back to normal state
228	// RAP [rh] Unused code: was used by MouseUp/MouseDown listener code	234	// RAP [rh] Unused code: was used by MouseUp/MouseDown listener code
229	// armed = false;	235	// armed = false;
230	// RAP [rh] missing accessibility support
231	// getAccessible().setFocus(ACC.CHILDID_SELF);
232	if (listeners == null)	236	if (listeners == null)
233	return;	237	return;
234	int size = listeners.size();	238	int size = listeners.size();
Lines 244-251 Link Here
244	// RAP [if] Cursor is managed on the client side	248	// RAP [if] Cursor is managed on the client side
245	// if (!isDisposed())	249	// if (!isDisposed())
246	// setCursor(FormsResources.getHandCursor());	250	// setCursor(FormsResources.getHandCursor());
		251	// RAP [if] missing accessibility support
		252	// triggerAccessible();
247	}	253	}
248		254
		255	// RAP [if] missing accessibility support
		256	// void triggerAccessible() {
		257	// getAccessible().setFocus(ACC.CHILDID_SELF);
		258	// }
		259
249	/**	260	/**
250	* Sets the object associated with this hyperlink. Concrete implementation	261	* Sets the object associated with this hyperlink. Concrete implementation
251	* of this class can use if to store text, URLs or model objects that need	262	* of this class can use if to store text, URLs or model objects that need
Lines 349-355 Link Here
349	*/	360	*/
350		361
351	public void setEnabled (boolean enabled) {	362	public void setEnabled (boolean enabled) {
		363	boolean needsRedraw = enabled != getEnabled();
352	super.setEnabled(enabled);	364	super.setEnabled(enabled);
353	redraw();	365	if (needsRedraw)
		366	redraw();
354	}	367	}
355	}	368	}




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

 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Martin Donnelly (m2a3@eircom.net) - patch (see Bugzilla #145997) 
 *******************************************************************************/
package org.eclipse.ui.forms.widgets;


import java.util.Hashtable;

import org.eclipse.core.runtime.ListenerList;

import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
// RAP [if] accessibility not supported

 * on the fly.
 * <p>
 * When configured to use formatting XML, the control requires the root element
 * <code>form</code> to be used and requires any ampersand (&amp;) characters in the text to
 * be replaced by the entity <b>&amp;amp;</b>. The following tags can be children of the
 * <code>form</code> element:
 * </p>
 * <ul>

	// RAP [if] Need to instruct LCA to relayout the segments to the client
	private boolean hasLayoutChanged = false;

	// private fields	
	//TODO We should remove the dependency on Platform
	private static final boolean DEBUG_TEXT = false;//"true".equalsIgnoreCase(Platform.getDebugOption(FormUtil.DEBUG_TEXT));
	private static final boolean DEBUG_TEXTSIZE = false;//"true".equalsIgnoreCase(Platform.getDebugOption(FormUtil.DEBUG_TEXTSIZE));


					int pwidth = 0;
					for (int j = 0; j < segments.length; j++) {
						ParagraphSegment segment = segments[j];
						segment.advanceLocator(gc, wHint, loc, resourceTable, false);
								false);
						if (wHint != SWT.DEFAULT) {
							width = Math.max(width, loc.width);
						} else {
							pwidth = Math.max(pwidth, loc.width);
						}
						if (segment instanceof IFocusSelectable)
							selectableInTheLastRow = true;

			Locator loc = new Locator();
			loc.marginWidth = marginWidth;
			loc.marginHeight = marginHeight;
			loc.x = marginWidth;
			loc.y = marginHeight;
			FontMetrics fm = gc.getFontMetrics();
			int lineHeight = fm.getHeight();

	/**
	 * Contructs a new form text widget in the provided parent and using the
	 * styles.
	 * <p>
	 * The only valid style bit for <code>FormText</code> is <code>SWT.NO_FOCUS</code>.
	 * This will cause the widget to always refuse focus.
	 *
	 * @param parent
	 *            form text parent control

		SelectionEvent selEvent = new SelectionEvent( event );
		selEvent.processEvent();
// RAP [if] accessibility not supported
//		// A listener could have caused the widget to be disposed
//		if (!isDisposed()) {
//		    getAccessible().selectionChanged();
//		}
	}

// RAP [if] MouseMoveListener not supported

					setFocus();
				}
				model.selectLink(segmentUnder);
				enterLink(segmentUnder, e.stateMask);
//				enterLink(segmentUnder, e.stateMask);
				enterLink(segmentUnder, SWT.NULL);
// RAP [if]	paintFocusTransfer unnecessary
//				paintFocusTransfer(oldLink, segmentUnder);
			}

		} else {
			if (e.button == 1) {
				endSelection(e);
				if (isDisposed()) return;
				IHyperlinkSegment segmentUnder = model
						.findHyperlinkAt(e.x, e.y);
				if (segmentUnder != null && armed == segmentUnder && selData == null) {
					activateLink(segmentUnder, e.stateMask);
//					activateLink(segmentUnder, e.stateMask);
				    activateLink(segmentUnder, SWT.NULL);
					armed = null;
				}
			}

						break;
					valid = setControlFocus(advance, selectable);
				}
				if (selectable != null)
					setFocusToNextSibling(this, true);
				else
					ensureVisible(selectable);
				if (selectable instanceof IHyperlinkSegment) {
					enterLink((IHyperlinkSegment) selectable, SWT.NULL);
// RAP [if] paint not supported
//					paintFocusTransfer(null, (IHyperlinkSegment) selectable);
				}
			}
		} else {
// RAP [if] paint not supported
//			paintFocusTransfer(getSelectedLink(), null);
			model.selectLink(null);
		}
		if (!model.hasFocusSegments())
			redraw();
	}

	private void enterLink(IHyperlinkSegment link, int stateMask) {

		} else {
			size = new Point(wHint, hHint);
		}
		// RAP [if] Last line of text is cutoff - increase the height with 2px
		// TODO: Find proper solution
		Rectangle trim = computeTrim(0, 0, size.x, size.y + 2 );
		if (DEBUG_TEXTSIZE)
			System.out.println("FormText Computed size: "+trim); //$NON-NLS-1$
		return new Point(trim.width, trim.height);

	 * @see org.eclipse.swt.widgets.Control#setFocus()
	 */
	public boolean setFocus() {
		mouseFocus = true;
		FormUtil.setFocusScrollingEnabled(this, false);
		boolean result = super.setFocus();
		mouseFocus = false;
		FormUtil.setFocusScrollingEnabled(this, true);
		return result;
	}

Lines 1-5 Link Here

(-)src/org/eclipse/ui/forms/widgets/Form.java (-1 / +20 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 27-33 Link Here
27	import org.eclipse.swt.widgets.Menu;	27	import org.eclipse.swt.widgets.Menu;
28	import org.eclipse.ui.forms.IFormColors;	28	import org.eclipse.ui.forms.IFormColors;
29	import org.eclipse.ui.forms.IMessage;	29	import org.eclipse.ui.forms.IMessage;
		30	import org.eclipse.ui.forms.IMessageManager;
30	import org.eclipse.ui.forms.events.IHyperlinkListener;	31	import org.eclipse.ui.forms.events.IHyperlinkListener;
		32	import org.eclipse.ui.internal.forms.MessageManager;
31	import org.eclipse.ui.internal.forms.widgets.FormHeading;	33	import org.eclipse.ui.internal.forms.widgets.FormHeading;
32	import org.eclipse.ui.internal.forms.widgets.FormUtil;	34	import org.eclipse.ui.internal.forms.widgets.FormUtil;
33		35
Lines 86-91 Link Here
86	* desired layout manager explicitly.	88	* desired layout manager explicitly.
87	* <p>	89	* <p>
88	* Although the class is not final, it should not be subclassed.	90	* Although the class is not final, it should not be subclassed.
		91	*
		92	* @since 1.0
		93	* @noextend This class is not intended to be subclassed by clients.
89	*/	94	*/
90	public class Form extends Composite {	95	public class Form extends Composite {
91	private FormHeading head;	96	private FormHeading head;
Lines 97-102 Link Here
97	private SizeCache headCache = new SizeCache();	102	private SizeCache headCache = new SizeCache();
98		103
99	private FormText selectionText;	104	private FormText selectionText;
		105
		106	private MessageManager messageManager;
100		107
101	private class FormLayout extends Layout implements ILayoutExtension {	108	private class FormLayout extends Layout implements ILayoutExtension {
102	public int computeMinimumWidth(Composite composite, boolean flushCache) {	109	public int computeMinimumWidth(Composite composite, boolean flushCache) {
Lines 758-761 Link Here
758	}	765	}
759	this.selectionText = text;	766	this.selectionText = text;
760	}	767	}
		768
		769	/**
		770	* Returns the message manager that will keep track of messages in this
		771	* form.
		772	*
		773	* @return the message manager instance
		774	*/
		775	public IMessageManager getMessageManager() {
		776	if (messageManager == null)
		777	messageManager = new MessageManager(this);
		778	return messageManager;
		779	}
761	}	780	}

Lines 1-5 Link Here

(-)src/org/eclipse/ui/forms/widgets/ImageHyperlink.java (-2 / +34 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 12-18 Link Here
12	package org.eclipse.ui.forms.widgets;	12	package org.eclipse.ui.forms.widgets;
13		13
14	import org.eclipse.swt.SWT;	14	import org.eclipse.swt.SWT;
15	import org.eclipse.swt.graphics.*;	15	import org.eclipse.swt.events.DisposeEvent;
		16	import org.eclipse.swt.events.DisposeListener;
		17	import org.eclipse.swt.graphics.GC;
		18	import org.eclipse.swt.graphics.Image;
		19	import org.eclipse.swt.graphics.Point;
		20	import org.eclipse.swt.graphics.Rectangle;
16	import org.eclipse.swt.widgets.Composite;	21	import org.eclipse.swt.widgets.Composite;
17	import org.eclipse.swt.widgets.Event;	22	import org.eclipse.swt.widgets.Event;
18		23
Lines 42-47 Link Here
42	private Image hoverImage;	47	private Image hoverImage;
43		48
44	private Image activeImage;	49	private Image activeImage;
		50
		51	// RAP [if] unused
		52	// private Image disabledImage;
45		53
46	private int state;	54	private int state;
47		55
Lines 64-69 Link Here
64	public ImageHyperlink(Composite parent, int style) {	72	public ImageHyperlink(Composite parent, int style) {
65	super(parent, removeAlignment(style));	73	super(parent, removeAlignment(style));
66	extractAlignment(style);	74	extractAlignment(style);
		75	// RAP [if] unused
		76	// addDisposeListener(new DisposeListener() {
		77	// public void widgetDisposed(DisposeEvent e) {
		78	// if (disabledImage != null)
		79	// disabledImage.dispose();
		80	// }
		81	// });
67	}	82	}
68		83
69	//RAP [rh] Disabled because of disabled AbstractHyperlink#paintHyperlink()	84	//RAP [rh] Disabled because of disabled AbstractHyperlink#paintHyperlink()
Lines 234-239 Link Here
234	*/	249	*/
235	public void setImage(Image image) {	250	public void setImage(Image image) {
236	this.image = image;	251	this.image = image;
		252	// RAP [if] unused
		253	// if (disabledImage != null)
		254	// disabledImage.dispose();
		255	// if (!isEnabled() && image != null && !image.isDisposed())
		256	// disabledImage = new Image(image.getDevice(), image, SWT.IMAGE_DISABLE);
237	}	257	}
238		258
239	private Point computeMaxImageSize() {	259	private Point computeMaxImageSize() {
Lines 288-291 Link Here
288	horizontalAlignment = SWT.RIGHT;	308	horizontalAlignment = SWT.RIGHT;
289	}	309	}
290	}	310	}
		311
		312	public void setEnabled(boolean enabled) {
		313	// RAP [if] unused
		314	// if (!enabled && (disabledImage == null \|\| disabledImage.isDisposed()) && image != null && !image.isDisposed()) {
		315	// disabledImage = new Image(image.getDevice(), image, SWT.IMAGE_DISABLE);
		316	// }
		317	super.setEnabled(enabled);
		318	// if (enabled && disabledImage != null) {
		319	// disabledImage.dispose();
		320	// disabledImage = null;
		321	// }
		322	}
291	}	323	}




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

 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Kai Nacke - Fix for Bug 202382
 *     Bryan Hunt - Fix for Bug 245457
 *******************************************************************************/
package org.eclipse.ui.forms.widgets;


import org.eclipse.swt.SWT;
//import org.eclipse.swt.events.FocusEvent;
//import org.eclipse.swt.events.FocusListener;
import org.eclipse.swt.events.KeyAdapter;
import org.eclipse.swt.events.KeyEvent;
//import org.eclipse.swt.events.PaintEvent;
//import org.eclipse.swt.events.PaintListener;
//import org.eclipse.swt.events.TraverseEvent;

 * The widget can be instantiated as-is, or subclassed to modify some aspects of
 * it. *
 * <p>
 * <!-- RAP [rh] no key events
 * Since 3.1, left/right arrow keys can be used to control the expansion state.
 * If several expandable composites are created in the same parent, up/down
 * arrow keys can be used to traverse between them. Expandable text accepts
 * mnemonics and mnemonic activation will toggle the expansion state.
 * -->
 *
 * <p>
 * While expandable composite recognize that different styles can be used to

	 * be positioned after the text control and vertically centered with it.
	 */
	public static final int LEFT_TEXT_CLIENT_ALIGNMENT = 1 << 13;
	
	/**
	 * By default, a focus box is painted around the title when it receives focus.
	 * If this style is used, the focus box will not be painted.  This style does
	 * not apply when FOCUS_TITLE is used.
	 */
	public static final int NO_TITLE_FOCUS_BOX = 1 << 14;

	/**
	 * Width of the margin that will be added around the control (default is 0).

					size = textLabelCache.computeSize(SWT.DEFAULT, SWT.DEFAULT);
					if (twidth < size.x + IGAP + tcsize.x) {
						twidth -= IGAP;
						if (textLabel instanceof Label) {
							GC gc = new GC(textLabel);
							size = FormUtil.computeWrapSize(gc, ((Label)textLabel).getText(), Math.round(twidth*(size.x/(float)(size.x+tcsize.x))));
							gc.dispose();
						} else
							size = textLabelCache.computeSize(Math.round(twidth*(size.x/(float)(size.x+tcsize.x))), SWT.DEFAULT);
						tcsize = textClientCache.computeSize(twidth-size.x, SWT.DEFAULT);
					}

					size = textLabelCache.computeSize(SWT.DEFAULT, SWT.DEFAULT);
					if (innertHint != SWT.DEFAULT && innertHint < size.x + IGAP + tcsize.x) {
						innertHint -= IGAP;
						if (textLabel instanceof Label) {
							GC gc = new GC(textLabel);
							size = FormUtil.computeWrapSize(gc, ((Label)textLabel).getText(), Math.round(innertHint*(size.x/(float)(size.x+tcsize.x))));
							gc.dispose();
						} else
							size = textLabelCache.computeSize(Math.round(innertHint*(size.x/(float)(size.x+tcsize.x))), SWT.DEFAULT);
						tcsize = textClientCache.computeSize(innertHint-size.x, SWT.DEFAULT);
					}

					toggleState();
				}
			});
// RAP [rh] missing paint
//			toggle.addPaintListener(new PaintListener() {
//				public void paintControl(PaintEvent e) {
//					if (textLabel instanceof Label && !isFixedStyle())

//								: getTitleBarForeground());
//				}
//			});
			toggle.addKeyListener(new KeyAdapter() {
				public void keyPressed(KeyEvent e) {
					if (e.keyCode == SWT.ARROW_UP) {
						verticalMove(false);
						e.doit = false;
					} else if (e.keyCode == SWT.ARROW_DOWN) {
						verticalMove(true);
						e.doit = false;
					}
				}
			});
// RAP [rh] Unnecessary to add focus listener, focus-border must be handled
//		 on the client-side
//			if ((getExpansionStyle()&FOCUS_TITLE)==0) {

	 *            the title bar foreground
	 */
	public void setTitleBarForeground(Color color) {
		if (hasTitleBar())
			titleBarForeground = color;
		if (textLabel != null)
			textLabel.setForeground(color);
	}

	/**

		}
	}

	private void verticalMove(boolean down) {
		Composite parent = getParent();
		Control[] children = parent.getChildren();
		for (int i = 0; i < children.length; i++) {
			Control child = children[i];
			if (child == this) {
				ExpandableComposite sibling = getSibling(children, i, down);
				if (sibling != null && sibling.toggle != null) {
					sibling.setFocus();
				}
				break;
			}
		}
	}

	private ExpandableComposite getSibling(Control[] children, int index,
			boolean down) {
		int loc = down ? index + 1 : index - 1;
		while (loc >= 0 && loc < children.length) {
			Control c = children[loc];
			if (c instanceof ExpandableComposite && c.isVisible())
				return (ExpandableComposite) c;
			loc = down ? loc + 1 : loc - 1;
		}
		return null;
	}
//	}

	private void programmaticToggleState() {
		if (toggle != null)

Lines 1-5 Link Here

(-)src/org/eclipse/ui/forms/widgets/ToggleHyperlink.java (-32 / +41 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 9-15 Link Here
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.ui.forms.widgets;	11	package org.eclipse.ui.forms.widgets;
12	//import org.eclipse.swt.SWT;	12	import org.eclipse.swt.SWT;
13	//import org.eclipse.swt.accessibility.*;	13	//import org.eclipse.swt.accessibility.*;
14	import org.eclipse.swt.graphics.*;	14	import org.eclipse.swt.graphics.*;
15	import org.eclipse.swt.widgets.*;	15	import org.eclipse.swt.widgets.*;
Lines 22-27 Link Here
22	* This is an abstract class. Subclasses are responsible for rendering the	22	* This is an abstract class. Subclasses are responsible for rendering the
23	* control using decoration and hover decoration color. Control should be	23	* control using decoration and hover decoration color. Control should be
24	* rendered based on the current expansion state.	24	* rendered based on the current expansion state.
		25	* <p>
		26	* <dl>
		27	* <dt><b>Styles:</b></dt>
		28	* <dd>None</dd>
		29	* </dl>
25	*	30	*
26	* @since 1.0	31	* @since 1.0
27	*/	32	*/
Lines 42-51 Link Here
42	*/	47	*/
43	public ToggleHyperlink(Composite parent, int style) {	48	public ToggleHyperlink(Composite parent, int style) {
44	super(parent, style);	49	super(parent, style);
45	// RAP [rh] Mouse and key events missing	50	// RAP [rh] Mouse events missing
46	// Listener listener = new Listener() {	51	Listener listener = new Listener() {
47	// public void handleEvent(Event e) {	52	public void handleEvent(Event e) {
48	// switch (e.type) {	53	switch (e.type) {
49	// case SWT.MouseEnter:	54	// case SWT.MouseEnter:
50	// hover=true;	55	// hover=true;
51	// redraw();	56	// redraw();
Lines 54-68 Link Here
54	// hover = false;	59	// hover = false;
55	// redraw();	60	// redraw();
56	// break;	61	// break;
57	// case SWT.KeyDown:	62	case SWT.KeyDown:
58	// onKeyDown(e);	63	onKeyDown(e);
59	// break;	64	break;
60	// }	65	}
61	// }	66	}
62	// };	67	};
63	// addListener(SWT.MouseEnter, listener);	68	// addListener(SWT.MouseEnter, listener);
64	// addListener(SWT.MouseExit, listener);	69	// addListener(SWT.MouseExit, listener);
65	// addListener(SWT.KeyDown, listener);	70	addListener(SWT.KeyDown, listener);
66	addHyperlinkListener(new HyperlinkAdapter() {	71	addHyperlinkListener(new HyperlinkAdapter() {
67	public void linkActivated(HyperlinkEvent e) {	72	public void linkActivated(HyperlinkEvent e) {
68	setExpanded(!isExpanded());	73	setExpanded(!isExpanded());
Lines 157-164 Link Here
157	*/	162	*/
158	public void setExpanded(boolean expanded) {	163	public void setExpanded(boolean expanded) {
159	this.expanded = expanded;	164	this.expanded = expanded;
160	// RAP [rh] accessibility not implemented
161	// getAccessible().selectionChanged();
162	redraw();	165	redraw();
163	}	166	}
164	// RAP [rh] accessibility not implemented	167	// RAP [rh] accessibility not implemented
Lines 224-245 Link Here
224	// }	227	// }
225	// });	228	// });
226	// }	229	// }
227		230	// // set bogus childIDs on link activation to ensure state is read on expand/collapse
228	// RAP [rh] Key events missing	231	// void triggerAccessible() {
229	// private void onKeyDown(Event e) {	232	// getAccessible().setFocus(getAccessibleChildID());
230	// if (e.keyCode==SWT.ARROW_RIGHT) {
231	// // expand if collapsed
232	// if (!isExpanded()) {
233	// handleActivate(e);
234	// }
235	// e.doit=false;
236	// }
237	// else if (e.keyCode==SWT.ARROW_LEFT) {
238	// // collapse if expanded
239	// if (isExpanded()) {
240	// handleActivate(e);
241	// }
242	// e.doit=false;
243	// }
244	// }	233	// }
		234	// private int getAccessibleChildID() {
		235	// return ToggleHyperlink.this.isExpanded() ? 1 : 2;
		236	// }
		237
		238	private void onKeyDown(Event e) {
		239	if (e.keyCode==SWT.ARROW_RIGHT) {
		240	// expand if collapsed
		241	if (!isExpanded()) {
		242	handleActivate(e);
		243	}
		244	e.doit=false;
		245	}
		246	else if (e.keyCode==SWT.ARROW_LEFT) {
		247	// collapse if expanded
		248	if (isExpanded()) {
		249	handleActivate(e);
		250	}
		251	e.doit=false;
		252	}
		253	}
245	}	254	}




/*******************************************************************************
 *  Copyright (c) 2000, 2009 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.ui.forms.widgets;


		int row;

		int column;

		int height;

		int totalHeight;

		public RowSpan(Control child, int column, int row) {
			this.child = child;
			this.column = column;
			this.row = row;
		}





/*******************************************************************************
 *  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.ui.forms.widgets;

 * The control is rendered as box with a '+' or '-' sign, depending on the
 * expansion state. Focus indication is rendered around the box when the
 * control has keyboard focus.
 * <p>
 * <dl>
 * <dt><b>Styles:</b></dt>
 * <dd>None</dd>
 * </dl>
 * 
 * @see Twistie
 * @since 1.0




/*******************************************************************************
 * Copyright (c) 2000, 2009 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.custom.ScrolledComposite;
import org.eclipse.swt.events.FocusAdapter;
import org.eclipse.swt.events.FocusEvent;
import org.eclipse.swt.events.KeyAdapter;
import org.eclipse.swt.events.KeyEvent;
//import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
// RAP [rh] Paint events missing

	private BoldFontHolder boldFontHolder;

	private HyperlinkGroup hyperlinkGroup;
	
	private boolean isDisposed = false;

	/* default */
	VisibilityHandler visibilityHandler;

	/* default */
	KeyboardHandler keyboardHandler;
//	KeyboardHandler keyboardHandler;

	// RAP [rh] Paint events missing
//	private class BorderPainter implements PaintListener {

		}
	}

	private static class KeyboardHandler extends KeyAdapter {
		public void keyPressed(KeyEvent e) {
			Widget w = e.widget;
			if (w instanceof Control) {
				if (e.doit)
					FormUtil.processKey(e.keyCode, (Control) w);
			}
		}
	}
//	}

	private class BoldFontHolder {
		private Font normalFont;


	/**
	 * Creates a toolkit that is self-sufficient (will manage its own colors).
	 * <p>
	 * Clients that call this method must call {@link #dispose()} when they
	 * are finished using the toolkit.
	 *
	 */
	public FormToolkit(Display display) {

	 * Creates a toolkit that will use the provided (shared) colors. The toolkit
	 * will dispose the colors if and only if they are <b>not</b> marked as
	 * shared via the <code>markShared()</code> method.
	 * <p>
	 * Clients that call this method must call {@link #dispose()} when they
	 * are finished using the toolkit.
	 *
	 * @param colors
	 *            the shared colors

		if (text != null)
			hyperlink.setText(text);
		hyperlink.addFocusListener(visibilityHandler);
		hyperlink.addKeyListener(keyboardHandler);
//		hyperlink.addKeyListener(keyboardHandler);
		hyperlinkGroup.add(hyperlink);
		return hyperlink;
	}

		ImageHyperlink hyperlink = new ImageHyperlink(parent, style
				| orientation);
		hyperlink.addFocusListener(visibilityHandler);
		hyperlink.addKeyListener(keyboardHandler);
//		hyperlink.addKeyListener(keyboardHandler);
		hyperlinkGroup.add(hyperlink);
		return hyperlink;
	}

			if (ec.toggle != null) {
				if (trackFocus)
					ec.toggle.addFocusListener(visibilityHandler);
				if (trackKeyboard)
					ec.toggle.addKeyListener(keyboardHandler);
//					ec.toggle.addKeyListener(keyboardHandler);
			}
			if (ec.textLabel != null) {
				if (trackFocus)
					ec.textLabel.addFocusListener(visibilityHandler);
				if (trackKeyboard)
					ec.textLabel.addKeyListener(keyboardHandler);
//					ec.textLabel.addKeyListener(keyboardHandler);
			}
			return;
		}
		if (trackFocus)
			control.addFocusListener(visibilityHandler);
		if (trackKeyboard)
			control.addKeyListener(keyboardHandler);
//			control.addKeyListener(keyboardHandler);
	}

	/**

				((Control) e.widget).setFocus();
			}
		});
		if (composite.getParent() != null)
			composite.setMenu(composite.getParent().getMenu());
	}

	/**

			section.setTitleBarBackground(colors.getColor(IFormColors.TB_BG));
			section.setTitleBarBorderColor(colors
					.getColor(IFormColors.TB_BORDER));
			section.setTitleBarForeground(colors
					.getColor(IFormColors.TB_TOGGLE));
		}
		// call setTitleBarForeground regardless as it also sets the label color
		section.setTitleBarForeground(colors
				.getColor(IFormColors.TB_TOGGLE));
		return section;
	}


	 * Disposes the toolkit.
	 */
	public void dispose() {
		if (isDisposed) {
			return;
		}
		isDisposed = true;
		if (colors.isShared() == false) {
			colors.dispose();
			colors = null;

		hyperlinkGroup = new HyperlinkGroup(colors.getDisplay());
		hyperlinkGroup.setBackground(colors.getBackground());
		visibilityHandler = new VisibilityHandler();
		keyboardHandler = new KeyboardHandler();
//		keyboardHandler = new KeyboardHandler();
		boldFontHolder = new BoldFontHolder();
	}


Lines 1-5 Link Here

(-)src/org/eclipse/ui/forms/widgets/Hyperlink.java (-11 / +13 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2004, 2007 IBM Corporation and others.	2	* Copyright (c) 2004, 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 10-22 Link Here
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.ui.forms.widgets;	11	package org.eclipse.ui.forms.widgets;
12		12
13	import org.eclipse.rwt.graphics.Graphics;
14	import org.eclipse.swt.SWT;	13	import org.eclipse.swt.SWT;
15	//import org.eclipse.swt.accessibility.*;	14	//import org.eclipse.swt.accessibility.*;
16	import org.eclipse.swt.graphics.*;	15	import org.eclipse.swt.graphics.*;
17	import org.eclipse.swt.widgets.Composite;	16	import org.eclipse.swt.widgets.Composite;
		17	//import org.eclipse.ui.forms.FormColors;
		18	import org.eclipse.ui.internal.forms.widgets.*;
18	import org.eclipse.ui.forms.internal.widgets.IHyperlinkAdapter;	19	import org.eclipse.ui.forms.internal.widgets.IHyperlinkAdapter;
19	//import org.eclipse.ui.internal.forms.widgets.*;
20		20
21	/**	21	/**
22	* Hyperlink is a concrete implementation of the abstract base class that draws	22	* Hyperlink is a concrete implementation of the abstract base class that draws
Lines 25-30 Link Here
25	* for all the hyperlinks that belong to it.	25	* for all the hyperlinks that belong to it.
26	* <p>	26	* <p>
27	* Hyperlink can be extended.	27	* Hyperlink can be extended.
		28	* <p>
		29	* <dl>
		30	* <dt><b>Styles:</b></dt>
		31	* <dd>SWT.WRAP</dd>
		32	* </dl>
28	*	33	*
29	* @see org.eclipse.ui.forms.HyperlinkGroup	34	* @see org.eclipse.ui.forms.HyperlinkGroup
30	*/	35	*/
Lines 306-325 Link Here
306	// }	311	// }
307		312
308	protected Point computeTextSize(int wHint, int hHint) {	313	protected Point computeTextSize(int wHint, int hHint) {
309	// RAP [rh] Changed text size calculation due to missing GC
310	Point extent;	314	Point extent;
311	// GC gc = new GC(this);	315	GC gc = new GC(this);
312	// gc.setFont(getFont());	316	gc.setFont(getFont());
313	if ((getStyle() & SWT.WRAP) != 0 && wHint != SWT.DEFAULT) {	317	if ((getStyle() & SWT.WRAP) != 0 && wHint != SWT.DEFAULT) {
314	// extent = FormUtil.computeWrapSize(gc, getText(), wHint);	318	extent = FormUtil.computeWrapSize(gc, getText(), wHint);
315	extent = Graphics.textExtent( getFont(), getText(), wHint );
316	} else {	319	} else {
317	// extent = gc.textExtent(getText());	320	extent = gc.textExtent(getText());
318	extent = Graphics.stringExtent( getFont(), getText() );
319	if ((getStyle() & SWT.WRAP)==0 && wHint!=SWT.DEFAULT)	321	if ((getStyle() & SWT.WRAP)==0 && wHint!=SWT.DEFAULT)
320	extent.x = wHint;	322	extent.x = wHint;
321	}	323	}
322	// gc.dispose();	324	gc.dispose();
323	return extent;	325	return extent;
324	}	326	}
325	}	327	}




/*******************************************************************************
 *  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.ui.forms.widgets;

 * <p>
 * The control is rendered as a triangle that points to the right in the
 * collapsed and down in the expanded state. Triangle color can be changed.
 * <p>
 * <dl>
 * <dt><b>Styles:</b></dt>
 * <dd>None</dd>
 * </dl>
 * 
 * @see TreeNode
 * @since 1.0

Lines 1-5 Link Here

(-)src/org/eclipse/ui/forms/widgets/TableWrapData.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2009 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-20 Link Here
14	import org.eclipse.swt.graphics.Point;	14	import org.eclipse.swt.graphics.Point;
15		15
16	/**	16	/**
17	* Layout data used in conjunction with <code>HTMLTableLayout</code>.	17	* Layout data used in conjunction with <code>TableWrapLayout</code>.
18	* Children in a composite that uses this layout should call <samp>setLayoutData	18	* Children in a composite that uses this layout should call <samp>setLayoutData
19	* </samp> and pass an instance of this class to control physical placement in	19	* </samp> and pass an instance of this class to control physical placement in
20	* the parent.	20	* the parent.

Lines 1-5 Link Here

(-)src/org/eclipse/ui/forms/widgets/ScrolledForm.java (-5 / +31 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 12-23 Link Here
12		12
13	import org.eclipse.jface.action.IToolBarManager;	13	import org.eclipse.jface.action.IToolBarManager;
14	import org.eclipse.swt.SWT;	14	import org.eclipse.swt.SWT;
		15	import org.eclipse.swt.events.DisposeEvent;
		16	import org.eclipse.swt.events.DisposeListener;
15	import org.eclipse.swt.graphics.Color;	17	import org.eclipse.swt.graphics.Color;
16	import org.eclipse.swt.graphics.Image;	18	import org.eclipse.swt.graphics.Image;
17	import org.eclipse.swt.widgets.Composite;	19	import org.eclipse.swt.widgets.Composite;
18	import org.eclipse.swt.widgets.Control;	20	import org.eclipse.swt.widgets.Control;
19	import org.eclipse.swt.widgets.Menu;	21	import org.eclipse.swt.widgets.Menu;
20	import org.eclipse.ui.forms.IMessage;	22	import org.eclipse.ui.forms.IMessage;
		23	import org.eclipse.ui.forms.IMessageManager;
21		24
22	/**	25	/**
23	* ScrolledForm is a control that is capable of scrolling an instance of the	26	* ScrolledForm is a control that is capable of scrolling an instance of the
Lines 43-51 Link Here
43	* Although the class is not final, it is not expected to be be extended.	46	* Although the class is not final, it is not expected to be be extended.
44	*	47	*
45	* @since 1.0	48	* @since 1.0
		49	* @noextend This class is not intended to be subclassed by clients.
46	*/	50	*/
47	public class ScrolledForm extends SharedScrolledComposite {	51	public class ScrolledForm extends SharedScrolledComposite {
48	private Form content;	52	private Form content;
		53
		54	private boolean customMenu;
49		55
50	public ScrolledForm(Composite parent) {	56	public ScrolledForm(Composite parent) {
51	this(parent, SWT.V_SCROLL \| SWT.H_SCROLL);	57	this(parent, SWT.V_SCROLL \| SWT.H_SCROLL);
Lines 63-68 Link Here
63	content = new Form(this, SWT.NULL);	69	content = new Form(this, SWT.NULL);
64	super.setContent(content);	70	super.setContent(content);
65	content.setMenu(getMenu());	71	content.setMenu(getMenu());
		72	addDisposeListener(new DisposeListener() {
		73	public void widgetDisposed(DisposeEvent e) {
		74	if (!customMenu)
		75	setMenu(null);
		76	}
		77	});
66	}	78	}
67		79
68	/**	80	/**
Lines 71-76 Link Here
71	* @param menu	83	* @param menu
72	*/	84	*/
73	public void setMenu(Menu menu) {	85	public void setMenu(Menu menu) {
		86	customMenu = true;
74	super.setMenu(menu);	87	super.setMenu(menu);
75	if (content != null)	88	if (content != null)
76	content.setMenu(menu);	89	content.setMenu(menu);
Lines 253-263 Link Here
253	reflow(true);	266	reflow(true);
254	}	267	}
255		268
256	/*	269	/**
257	* (non-Javadoc)	270	* Sets the form message.
258	*	271	*
259	* @see org.eclipse.ui.forms.IMessageContainer#setMessage(java.lang.String,	272	* @param newMessage
260	* int)	273	* the message text or <code>null</code> to reset.
		274	* @param newType
		275	* as defined in
		276	* {@link org.eclipse.jface.dialogs.IMessageProvider}.
261	*/	277	*/
262	public void setMessage(String newMessage, int newType) {	278	public void setMessage(String newMessage, int newType) {
263	this.setMessage(newMessage, newType, null);	279	this.setMessage(newMessage, newType, null);
Lines 280-283 Link Here
280	public int getMessageType() {	296	public int getMessageType() {
281	return content.getMessageType();	297	return content.getMessageType();
282	}	298	}
		299
		300	/**
		301	* Returns the message manager that will keep track of messages in this
		302	* form.
		303	*
		304	* @return the message manager instance
		305	*/
		306	public IMessageManager getMessageManager() {
		307	return content.getMessageManager();
		308	}
283	}	309	}

Lines 1-12 Link Here

(-)src/org/eclipse/ui/forms/widgets/SharedScrolledComposite.java (-37 / +40 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2005 IBM Corporation and others.	2	* Copyright (c) 2000, 2009 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
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	* Wojciech Galanciak - fix for Bug 294868 - [Forms] Problem with text
		11	* wrapping in SharedScrolledComposite:
10	*******************************************************************************/	12	*******************************************************************************/
11	package org.eclipse.ui.forms.widgets;	13	package org.eclipse.ui.forms.widgets;
12		14
Lines 48-54 Link Here
48		50
49	private boolean reflowPending = false;	51	private boolean reflowPending = false;
50		52
51	private boolean delayedReflow = true;	53	private boolean delayedReflow = false;
52		54
53	/**	55	/**
54	* Creates the new instance.	56	* Creates the new instance.
Lines 179-221 Link Here
179	Rectangle clientArea = getClientArea();	181	Rectangle clientArea = getClientArea();
180	if (c == null)	182	if (c == null)
181	return;	183	return;
		184	// RAP [if] No scrollbars
		185	// if (clientArea.width == getSize().x) {
		186	// ScrollBar bar = getVerticalBar();
		187	// if (bar != null) {
		188	// clientArea.width -= bar.getSize().x;
		189	// }
		190	// }
182		191
183	contentCache.setControl(c);	192	contentCache.setControl(c);
184	if (flushCache) {	193	if (flushCache) {
185	contentCache.flush();	194	contentCache.flush();
186	}	195	}
187	try {	196	Point newSize = contentCache.computeSize(FormUtil.getWidthHint(
188	setRedraw(false);	197	clientArea.width, c), FormUtil.getHeightHint(clientArea.height,
189	Point newSize = contentCache.computeSize(FormUtil.getWidthHint(	198	c));
190	clientArea.width, c), FormUtil.getHeightHint(clientArea.height,
191	c));
192		199
193	// Point currentSize = c.getSize();	200	if (!(expandHorizontal && expandVertical)) {
194	if (!(expandHorizontal && expandVertical)) {	201	c.setSize(newSize);
195	c.setSize(newSize);	202	}
196	}
197		203
198	setMinSize(newSize);	204	setMinSize(newSize);
199	FormUtil.updatePageIncrement(this);	205	FormUtil.updatePageIncrement(this);
200		206
201	// reduce vertical scroll increment if necessary	207	// reduce vertical scroll increment if necessary
202	// RAP [rh] Scrollbar#setIncrement() missing	208	// RAP [rh] Scrollbar#setIncrement() missing
203	// ScrollBar vbar = getVerticalBar();	209	// ScrollBar vbar = getVerticalBar();
204	// if (vbar != null) {	210	// if (vbar != null) {
205	// if (getClientArea().height - 5 < V_SCROLL_INCREMENT)	211	// if (getClientArea().height - 5 < V_SCROLL_INCREMENT)
206	// getVerticalBar().setIncrement(getClientArea().height - 5);	212	// getVerticalBar().setIncrement(getClientArea().height - 5);
207	// else	213	// else
208	// getVerticalBar().setIncrement(V_SCROLL_INCREMENT);	214	// getVerticalBar().setIncrement(V_SCROLL_INCREMENT);
209	// }	215	// }
210		216
211	ignoreLayouts = false;	217	ignoreLayouts = false;
212	layout(flushCache);	218	layout(flushCache);
213	ignoreLayouts = true;	219	ignoreLayouts = true;
214		220
215	contentCache.layoutIfNecessary();	221	contentCache.layoutIfNecessary();
216	} finally {
217	setRedraw(true);
218	}
219	}	222	}
220		223
221	private void updateSizeWhilePending() {	224	private void updateSizeWhilePending() {
Lines 230-243 Link Here
230	updateSizeWhilePending();	233	updateSizeWhilePending();
231	return;	234	return;
232	}	235	}
		236	reflowPending = true;
233	getDisplay().asyncExec(new Runnable() {	237	getDisplay().asyncExec(new Runnable() {
234	public void run() {	238	public void run() {
		239	reflowPending = false;
235	if (!isDisposed())	240	if (!isDisposed())
236	reflow(flushCache);	241	reflow(flushCache);
237	reflowPending = false;
238	}	242	}
239	});	243	});
240	reflowPending = true;
241	} else	244	} else
242	reflow(flushCache);	245	reflow(flushCache);
243	}	246	}
Lines 268-275 Link Here
268	* Sets the delayed reflow feature. When used,	271	* Sets the delayed reflow feature. When used,
269	* it will schedule a reflow on resize requests	272	* it will schedule a reflow on resize requests
270	* and reject subsequent reflows until the	273	* and reject subsequent reflows until the
271	* scheduled one is performed. This improves	274	* scheduled one is performed.
272	* performance by	275	*
273	* @param delayedReflow	276	* @param delayedReflow
274	* The delayedReflow to set.	277	* The delayedReflow to set.
275	*/	278	*/




/*******************************************************************************
 *  Copyright (c) 2000, 2009 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
 *     Michael Williamson (eclipse-bugs@magnaworks.com) - patch (see Bugzilla #92545)
 *

import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.internal.forms.widgets.FormImages;
//import org.eclipse.ui.internal.forms.widgets.FormUtil;

		while (c != null) {
			c.setRedraw(false);
			c = c.getParent();
			if (c instanceof SharedScrolledComposite || c instanceof Shell) {
				break;
			}
		}

		while (c != null) {
			c.setRedraw(true);
			c = c.getParent();
			if (c instanceof SharedScrolledComposite || c instanceof Shell) {
				break;
			}
		}




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

	 */
	public static final int LEFT = 1;
	/**
	 * Horizontal alignment constant - control will be centered.
	 */
	public static final int CENTER = 2;
	/**
	 * Horizontal alignment constant - control will be aligned to the right.
	 */
	public static final int RIGHT = 3;
	/**




/*******************************************************************************
 * 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 java.io.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Hashtable;
import java.util.Vector;


 * @author
 */
public class Paragraph {
	public static final String[] PROTOCOLS = {"http://", "https://", "ftp://"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

	private Vector segments;


		if (text.length() == 0)
			return;
		if (expandURLs) {
			int loc = findUrl(text,0);

			if (loc == -1)
				addSegment(new TextSegment(text, fontId, colorId, wrapAllowed));

								fontId);
						break;
					}
					loc = findUrl(text,textLoc);
				}
				if (textLoc < text.length()) {
					addSegment(new TextSegment(text.substring(textLoc), fontId,

			addSegment(new TextSegment(text, fontId, colorId, wrapAllowed));
		}
	}
	
	private int findUrl(String text, int startIndex) {
		int[] locs = new int[PROTOCOLS.length];
		for (int i = 0; i < PROTOCOLS.length; i++)
			locs[i] = text.indexOf(PROTOCOLS[i], startIndex);
		Arrays.sort(locs);
		for (int i = 0; i < PROTOCOLS.length; i++)
			if (locs[i] != -1)
				return locs[i];
		return -1;
	}

	private void addHyperlinkSegment(String text, HyperlinkSettings settings,
			String fontId) {

		ArrayList heights = new ArrayList();
		hloc.heights = heights;
		hloc.rowCounter = 0;
		int innerWidth = width - loc.marginWidth*2;
		for (int j = 0; j < segments.length; j++) {
			ParagraphSegment segment = segments[j];
			segment.advanceLocator(gc, width, hloc, resourceTable, true);
		}
		hloc.collectHeights();
		loc.heights = heights;

Lines 1-5 Link Here

(-)src/org/eclipse/ui/internal/forms/widgets/TextHyperlinkSegment.java (-1 / +1 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2005 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




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

 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Wang Yizhuo (wangyizhuo@gmail.com) - patch (see Bugzilla #239178) 
 *******************************************************************************/
package org.eclipse.ui.internal.forms.widgets;

//import java.util.Arrays;
import java.util.HashMap;

import org.eclipse.jface.resource.ImageDescriptor;
//import org.eclipse.jface.resource.JFaceResources;
//import org.eclipse.jface.resource.LocalResourceManager;
import org.eclipse.swt.graphics.Color;
//import org.eclipse.swt.graphics.Device;
//import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Image;
//import org.eclipse.swt.graphics.ImageData;
import org.eclipse.swt.graphics.RGB;

public class FormImages {
	private static FormImages instance;

		return instance;
	}

//	private LocalResourceManager resources;
	private HashMap descriptors;
	
	private FormImages() {
	}
	
	private abstract class AbstractImageDescriptor extends ImageDescriptor {
		RGB[] fRGBs;
		Color[] fColors;
		int fLength;
		
		AbstractImageDescriptor(Color[] colors, int length) {
			fRGBs = new RGB[colors.length];
			for (int i = 0; i < colors.length; i++) {
				Color color = colors[i];
				fRGBs[i] = color == null ? null : color.getRGB();
			}
			fLength = length;
		}
		
		public boolean equals(Object obj) {
			if (obj instanceof AbstractImageDescriptor) {
				AbstractImageDescriptor id = (AbstractImageDescriptor)obj;
				if (id.fRGBs.length == fRGBs.length) {
					boolean result = id.fLength == fLength;
					for (int i = 0; i < fRGBs.length && result; i++) {
						result = result && id.fRGBs[i].equals(fRGBs[i]);
					}
					return result;
				}

		}
		
		public int hashCode() {
			int hash = 0;
			for (int i = 0; i < fRGBs.length; i++)
				hash = hash * 7 + fRGBs[i].hashCode();
			hash = hash * 7 + fLength;
			return hash;
		}
	}

// RAP [if] Unused code: was used by getGradient    
//	private class SimpleImageDescriptor extends AbstractImageDescriptor{
//		private int fTheight;
//		private int fMarginHeight;
//		
//		SimpleImageDescriptor (Color color1, Color color2,
//				int realtheight, int theight, int marginHeight) {
//			super(new Color[] {color1, color2}, realtheight);
//			fTheight = theight;
//			fMarginHeight = marginHeight;
//		}
//		
//		public boolean equals(Object obj) {
//			if (obj instanceof SimpleImageDescriptor) {
//				SimpleImageDescriptor id = (SimpleImageDescriptor) obj;
//				if (super.equals(obj)  &&
//						id.fTheight == fTheight && id.fMarginHeight == fMarginHeight)
//					return true;

//			hash = hash * 7 + new Integer(fMarginHeight).hashCode();
//			return hash;
//		}
//
//		public ImageData getImageData() {
//			return null;
//		}
//		
//		public Image createImage(boolean returnMissingImageOnError,	Device device) {
//			Image image = new Image(device, 1, fLength);
//			Color color1 = new Color(device, fRGBs[0]);
//			Color color2 = new Color(device, fRGBs[1]);
//			image.setBackground(color1);
//			GC gc = new GC(image);
//			gc.setBackground(color1);
//			gc.fillRectangle(0, 0, 1, fLength);
//			gc.setForeground(color2);
//			gc.setBackground(color1);
//			gc.fillGradientRectangle(0, fMarginHeight + 2, 1, fTheight - 2, true);
//			gc.dispose();
//			color1.dispose();
//			color2.dispose();
//			return image;
//		}
//	}
	
//	private class ComplexImageDescriptor extends AbstractImageDescriptor {
//		RGB fBgRGB;
//		boolean fVertical;
//		int[] fPercents;
//		
//		public ComplexImageDescriptor(Color[] colors, int length,
//				int[] percents, boolean vertical, Color bg) {
//			super(colors, length);
//			fBgRGB = bg == null ? null : bg.getRGB();
//			fVertical = vertical;
//			fPercents = percents;
//		}
//		
//		public boolean equals(Object obj) {
//			if (obj instanceof ComplexImageDescriptor) {
//				ComplexImageDescriptor id = (ComplexImageDescriptor) obj;
//				if (super.equals(obj)  &&
//						id.fVertical == fVertical && Arrays.equals(id.fPercents, fPercents)) {
//					if ((id.fBgRGB == null && fBgRGB == null) ||
//							(id.fBgRGB != null && id.fBgRGB.equals(fBgRGB)))
//						return true;
//					// if the only thing that isn't the same is the background color
//					// still return true if it does not matter (percents add up to 100)

//				hash = hash * 7 + new Integer(fPercents[i]).hashCode();
//			return hash;
//		}
//
//		public ImageData getImageData() {
//			return null;
//		}
//		
//		public Image createImage(boolean returnMissingImageOnError,	Device device) {
//			int width = fVertical ? 1 : fLength;
//			int height = fVertical ? fLength : 1;
//			Image gradient = new Image(device, Math.max(width, 1), Math
//					.max(height, 1));
//			GC gc = new GC(gradient);
//			Color[] colors = new Color[fRGBs.length];
//			for (int i = 0; i < colors.length; i++)
//				colors[i] = new Color(device, fRGBs[i]);
//			Color bg = fBgRGB == null ? null : new Color(device, fBgRGB);
//			drawTextGradient(gc, width, height, colors, fPercents, fVertical, bg);
//			gc.dispose();
//			for (int i = 0; i < colors.length; i++)
//				colors[i].dispose();
//			if (bg != null)
//				bg.dispose();
//			return gradient;
//		}
//
//		private void drawTextGradient(GC gc, int width, int height, Color[] colors,
//				int[] percents, boolean vertical, Color bg) {
//			final Color oldBackground = gc.getBackground();
//			if (colors.length == 1) {
//				if (colors[0] != null)
//					gc.setBackground(colors[0]);
//				gc.fillRectangle(0, 0, width, height);
//			} else {
//				final Color oldForeground = gc.getForeground();
//				Color lastColor = colors[0];
//				if (lastColor == null)
//					lastColor = oldBackground;
//				int pos = 0;
//				for (int i = 0; i < percents.length; ++i) {
//					gc.setForeground(lastColor);
//					lastColor = colors[i + 1];
//					if (lastColor == null)
//						lastColor = oldBackground;
//					gc.setBackground(lastColor);
//					if (vertical) {
//						int gradientHeight = percents[i] * height / 100;
//						
//						gc.fillGradientRectangle(0, pos, width, gradientHeight,
//								true);
//						pos += gradientHeight;
//					} else {
//						int gradientWidth = percents[i] * width / 100;
//						
//						gc.fillGradientRectangle(pos, 0, gradientWidth, height,
//								false);
//						pos += gradientWidth;
//					}
//				}
//				if (vertical && pos < height) {
//					if (bg != null)
//						gc.setBackground(bg);
//					gc.fillRectangle(0, pos, width, height - pos);
//				}
//				if (!vertical && pos < width) {
//					if (bg != null)
//						gc.setBackground(bg);
//					gc.fillRectangle(pos, 0, width - pos, height);
//				}
//				gc.setForeground(oldForeground);
//			}
//		}
//	}
	
//	public Image getGradient(Color color1, Color color2,
		private Image fImage;
		private int fCount;
		
		public ImageReference(Image image) {
			fImage = image;
			fCount = 1;
		}

		public Image getImage() {
			return fImage;
		}
		// returns a boolean indicating if all clients of this image are finished
		// a true result indicates the underlying image should be disposed
		public boolean decCount() {
			return --fCount == 0;
		}
		public void incCount() {
			fCount++;
		}
	}
	
// RAP [rh] missing Image-GC
//	public Image getGradient(Display display, Color color1, Color color2,
//			int realtheight, int theight, int marginHeight) {
//		if (color1 == null || color1.isDisposed() || color2 == null || color2.isDisposed())
//			return null;
//		AbstractImageDescriptor desc = new SimpleImageDescriptor(color1, color2, realtheight, theight, marginHeight);
//		return getGradient(desc);
//			result.incCount();
//			return result.getImage();
//		}
//		Image image = createGradient(display, color1, color2, realtheight, theight, marginHeight);
//		images.put(id, new ImageReference(image));
//		ids.put(image, id);
//		return image;
//	}
	
//	public Image getGradient(Color[] colors, int[] percents,
//			int length, boolean vertical, Color bg) {
//		if (colors.length == 0)
//			return null;
//		for (int i = 0; i < colors.length; i++)
//			if (colors[i] == null || colors[i].isDisposed())
//				return null;
//		if (bg != null && bg.isDisposed())
//			return null;
//		AbstractImageDescriptor desc = new ComplexImageDescriptor(colors, length, percents, vertical, bg);
//		return getGradient(desc);
//	}
	
//	private synchronized Image getGradient(AbstractImageDescriptor desc) {
//		checkHashMaps();
//		Image result = getResourceManager().createImage(desc);
//		descriptors.put(result, desc);
//		return result;
//			result.incCount();
//			return result.getImage();
//		}
//		Image image = createGradient(display, colors, percents, length, vertical, bg);
//		images.put(id, new ImageReference(image));
//		ids.put(image, id);
//		return image;
//	}
	
	public synchronized boolean markFinished(Image image) {
		checkHashMaps();
		AbstractImageDescriptor desc = (AbstractImageDescriptor)descriptors.get(image);
		if (desc != null) {
// RAP [if] unnecessary to destroy image
//			getResourceManager().destroyImage(desc);
//			if (getResourceManager().find(desc) == null) {
				descriptors.remove(image);
				validateHashMaps();
//			}
			return true;
					validateHashMaps();
				}
				return true;
			}
		}
		// if the image was not found, dispose of it for the caller
// RAP [if] unnecessary
//		image.dispose();
		return false;
	}

// RAP [if] unused	
//	private LocalResourceManager getResourceManager() {
//		if (resources == null)
//			resources = new LocalResourceManager(JFaceResources.getResources());
//		return resources;
//	}

	private void checkHashMaps() {
		if (descriptors == null)
			descriptors = new HashMap();
		if (ids == null)
			ids = new HashMap();
	}
	
	private void validateHashMaps() {
		if (descriptors.size() == 0)
			descriptors = null;
		if (ids.size() == 0)
			ids = null;
	}
	
// RAP [rh] Disabled unused code, called by getGradient
//	private Image createGradient(Display display, Color color1, Color color2,
//			int realtheight, int theight, int marginHeight) {
//		Image image = new Image(display, 1, realtheight);
//		image.setBackground(color1);
//		GC gc = new GC(image);
//		gc.setBackground(color1);
//		gc.fillRectangle(0, 0, 1, realtheight);
//		gc.setForeground(color2);
//		gc.setBackground(color1);
//		gc.fillGradientRectangle(0, marginHeight + 2, 1, theight - 2, true);
//		gc.dispose();
//		return image;
//	}
//	
//	private Image createGradient(Display display, Color[] colors, int[] percents,
//			int length, boolean vertical, Color bg) {
//		int width = vertical ? 1 : length;
//		int height = vertical ? length : 1;
//		Image gradient = new Image(display, Math.max(width, 1), Math
//				.max(height, 1));
//		GC gc = new GC(gradient);
//		drawTextGradient(gc, width, height, colors, percents, vertical, bg);
//		gc.dispose();
//		return gradient;
//	}
//
//	private void drawTextGradient(GC gc, int width, int height, Color[] colors,
//			int[] percents, boolean vertical, Color bg) {
//		final Color oldBackground = gc.getBackground();
//		if (colors.length == 1) {
//			if (colors[0] != null)
//				gc.setBackground(colors[0]);
//			gc.fillRectangle(0, 0, width, height);
//		} else {
//			final Color oldForeground = gc.getForeground();
//			Color lastColor = colors[0];
//			if (lastColor == null)
//				lastColor = oldBackground;
//			int pos = 0;
//			for (int i = 0; i < percents.length; ++i) {
//				gc.setForeground(lastColor);
//				lastColor = colors[i + 1];
//				if (lastColor == null)
//					lastColor = oldBackground;
//				gc.setBackground(lastColor);
//				if (vertical) {
//					int gradientHeight = percents[i] * height / 100;
//					
//					gc.fillGradientRectangle(0, pos, width, gradientHeight,
//							true);
//					pos += gradientHeight;
//				} else {
//					int gradientWidth = percents[i] * height / 100;
//					
//					gc.fillGradientRectangle(pos, 0, gradientWidth, height,
//							false);
//					pos += gradientWidth;
//				}
//			}
//			if (vertical && pos < height) {
//				if (bg != null)
//					gc.setBackground(bg);
//				gc.fillRectangle(0, pos, width, height - pos);
//			}
//			if (!vertical && pos < width) {
//				if (bg != null)
//					gc.setBackground(bg);
//				gc.fillRectangle(pos, 0, width - pos, height);
//			}
//			gc.setForeground(oldForeground);
//		}
//	}
}




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

			iwidth = objectSize.x + (isSelectable()?2:0);
			iheight = objectSize.y + (isSelectable()?2:0);
		}
		if (wHint != SWT.DEFAULT && !nowrap && loc.x + iwidth + loc.marginWidth > wHint) {
			// new line
			if (computeHeightOnly)
				loc.collectHeights();
			loc.resetCaret();
			loc.x += iwidth;
			loc.y += loc.rowHeight;
			loc.width = loc.x;
			loc.rowHeight = iheight;
			loc.leading = 0;
			newLine = true;

			return;
		loc.width = objWidth;

		if (!nowrap && loc.x + objWidth + loc.marginWidth > width) {
			// new row
			loc.newLine();
			loc.rowCounter++;

Lines 10-18 Link Here

(-)src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.ui.internal.forms.widgets;	11	package org.eclipse.ui.internal.forms.widgets;
12		12
		13	import org.eclipse.rwt.graphics.Graphics;
		14
13	import org.eclipse.jface.action.IMenuManager;	15	import org.eclipse.jface.action.IMenuManager;
14	import org.eclipse.jface.action.MenuManager;	16	import org.eclipse.jface.action.MenuManager;
15	import org.eclipse.rwt.graphics.Graphics;
16	import org.eclipse.swt.SWT;	17	import org.eclipse.swt.SWT;
17	import org.eclipse.swt.dnd.DragSource;	18	import org.eclipse.swt.dnd.DragSource;
18	import org.eclipse.swt.dnd.DragSourceEffect;	19	import org.eclipse.swt.dnd.DragSourceEffect;

Lines 15-23 Link Here

(-)src/org/eclipse/ui/internal/forms/widgets/AggregateHyperlinkSegment.java (-1 / +1 lines)
15		15
16	// RAP [if] unnecessary	16	// RAP [if] unnecessary
17	//import org.eclipse.swt.graphics.Color;	17	//import org.eclipse.swt.graphics.Color;
18	import org.eclipse.rwt.Adaptable;
19	import org.eclipse.swt.graphics.GC;	18	import org.eclipse.swt.graphics.GC;
20	import org.eclipse.swt.graphics.Rectangle;	19	import org.eclipse.swt.graphics.Rectangle;
		20	import org.eclipse.rwt.Adaptable;
21	import org.eclipse.ui.forms.internal.widgets.IAggregateHyperlinkSegmentAdapter;	21	import org.eclipse.ui.forms.internal.widgets.IAggregateHyperlinkSegmentAdapter;
22		22
23	/**	23	/**




/*******************************************************************************
 * Copyright (c) 2000, 2009 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.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;

public class FormTextModel {

	/*
	 * This class prevents parse errors from being written to standard output
	 */
	public class ParseErrorHandler implements ErrorHandler {

		public void error(SAXParseException arg0) throws SAXException {
		}

		public void fatalError(SAXParseException arg0) throws SAXException {
		}

		public void warning(SAXParseException arg0) throws SAXException {
		}
	}
	
	private static final DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory
			.newInstance();


		try {
			DocumentBuilder parser = documentBuilderFactory
					.newDocumentBuilder();
			parser.setErrorHandler(new ParseErrorHandler());
			InputSource source = new InputSource(is);
			Document doc = parser.parse(source);
			processDocument(doc, expandURLs);
		} catch (ParserConfigurationException e) {
			SWT.error(SWT.ERROR_INVALID_ARGUMENT, e, " " + e.getMessage()); //$NON-NLS-1$
		} catch (SAXException e) {
			SWT.error(SWT.ERROR_INVALID_ARGUMENT, e, " " + e.getMessage()); //$NON-NLS-1$
		} catch (IOException e) {
			SWT.error(SWT.ERROR_IO, e);
		}

Lines 1-5 Link Here

(-)src/org/eclipse/ui/internal/forms/widgets/BusyIndicator.java (-183 / +40 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2006, 2007 IBM Corporation and others.	2	* Copyright (c) 2006, 2009 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-177 Link Here
18	import org.eclipse.core.runtime.Path;	18	import org.eclipse.core.runtime.Path;
19	import org.eclipse.core.runtime.Platform;	19	import org.eclipse.core.runtime.Platform;
20	import org.eclipse.jface.resource.ImageDescriptor;	20	import org.eclipse.jface.resource.ImageDescriptor;
21	//import org.eclipse.swt.SWT;	21	import org.eclipse.swt.SWT;
		22	import org.eclipse.swt.events.DisposeEvent;
		23	import org.eclipse.swt.events.DisposeListener;
22	//import org.eclipse.swt.events.PaintEvent;	24	//import org.eclipse.swt.events.PaintEvent;
23	//import org.eclipse.swt.events.PaintListener;	25	//import org.eclipse.swt.events.PaintListener;
24	//import org.eclipse.swt.graphics.GC;	26	//import org.eclipse.swt.graphics.GC;
25	import org.eclipse.swt.graphics.Image;	27	import org.eclipse.swt.graphics.Image;
26	//import org.eclipse.swt.graphics.ImageData;
27	import org.eclipse.swt.graphics.Point;	28	import org.eclipse.swt.graphics.Point;
28	import org.eclipse.swt.graphics.Rectangle;	29	import org.eclipse.swt.graphics.Rectangle;
29	import org.eclipse.swt.widgets.*;	30	import org.eclipse.swt.widgets.Label;
		31	import org.eclipse.swt.widgets.Composite;
		32	//import org.eclipse.swt.widgets.Display;
30	import org.osgi.framework.Bundle;	33	import org.osgi.framework.Bundle;
31		34
32	// RAP [rh] Changed class hierarchy: now extends Label instead of Canvas	35	// RAP [rh] Changed class hierarchy: now extends Label instead of Canvas
33	// public final class BusyIndicator extends Canvas {	36	// public final class BusyIndicator extends Canvas {
34	public final class BusyIndicator extends Label {	37	public final class BusyIndicator extends Label {
35		38
36	// class BusyThread extends Thread {
37	// Rectangle bounds;
38	// Display display;
39	// GC offScreenImageGC;
40	// Image offScreenImage;
41	// Image timage;
42	// boolean stop;
43	//
44	// private BusyThread(Rectangle bounds, Display display, GC offScreenImageGC, Image offScreenImage) {
45	// this.bounds = bounds;
46	// this.display = display;
47	// this.offScreenImageGC = offScreenImageGC;
48	// this.offScreenImage = offScreenImage;
49	// }
50	//
51	// public void run() {
52	// try {
53	// /*
54	// * Create an off-screen image to draw on, and fill it with
55	// * the shell background.
56	// */
57	// FormUtil.setAntialias(offScreenImageGC, SWT.ON);
58	// display.syncExec(new Runnable() {
59	// public void run() {
60	// if (!isDisposed())
61	// drawBackground(offScreenImageGC, 0, 0,
62	// bounds.width,
63	// bounds.height);
64	// }
65	// });
66	// if (isDisposed())
67	// return;
68	//
69	// /*
70	// * Create the first image and draw it on the off-screen
71	// * image.
72	// */
73	// int imageDataIndex = 0;
74	// ImageData imageData;
75	// synchronized (BusyIndicator.this) {
76	// timage = getImage(imageDataIndex);
77	// imageData = timage.getImageData();
78	// offScreenImageGC.drawImage(timage, 0, 0,
79	// imageData.width, imageData.height, imageData.x,
80	// imageData.y, imageData.width, imageData.height);
81	// }
82	//
83	// /*
84	// * Now loop through the images, creating and drawing
85	// * each one on the off-screen image before drawing it on
86	// * the shell.
87	// */
88	// while (!stop && !isDisposed() && timage != null) {
89	//
90	// /*
91	// * Fill with the background color before
92	// * drawing.
93	// */
94	// final ImageData fimageData = imageData;
95	// display.syncExec(new Runnable() {
96	// public void run() {
97	// if (!isDisposed()) {
98	// drawBackground(offScreenImageGC, fimageData.x,
99	// fimageData.y, fimageData.width,
100	// fimageData.height);
101	// }
102	// }
103	// });
104	//
105	// synchronized (BusyIndicator.this) {
106	// imageDataIndex = (imageDataIndex + 1) % IMAGE_COUNT;
107	// timage = getImage(imageDataIndex);
108	// imageData = timage.getImageData();
109	// offScreenImageGC.drawImage(timage, 0, 0,
110	// imageData.width, imageData.height,
111	// imageData.x, imageData.y, imageData.width,
112	// imageData.height);
113	// }
114	//
115	// /* Draw the off-screen image to the shell. */
116	// animationImage = offScreenImage;
117	// display.syncExec(new Runnable() {
118	// public void run() {
119	// if (!isDisposed())
120	// redraw();
121	// }
122	// });
123	// /*
124	// * Sleep for the specified delay time
125	// */
126	// try {
127	// Thread.sleep(MILLISECONDS_OF_DELAY);
128	// } catch (InterruptedException e) {
129	// e.printStackTrace();
130	// }
131	//
132	//
133	// }
134	// } catch (Exception e) {
135	// } finally {
136	// display.syncExec(new Runnable() {
137	// public void run() {
138	// if (offScreenImage != null
139	// && !offScreenImage.isDisposed())
140	// offScreenImage.dispose();
141	// if (offScreenImageGC != null
142	// && !offScreenImageGC.isDisposed())
143	// offScreenImageGC.dispose();
144	// }
145	// });
146	// clearImages();
147	// }
148	// if (busyThread == null)
149	// display.syncExec(new Runnable() {
150	// public void run() {
151	// animationImage = null;
152	// if (!isDisposed())
153	// redraw();
154	// }
155	// });
156	// }
157	//
158	// public void setStop(boolean stop) {
159	// this.stop = stop;
160	// }
161	// }
162
163	private static final int MARGIN = 0;	39	private static final int MARGIN = 0;
164	// RAP [rh] instead of manually animating 8 png images, RAP uses one animated gif	40	// RAP [rh] instead of manually animating 8 png images, RAP uses one animated gif
165	// private static final int IMAGE_COUNT = 8;	41	// private static final int IMAGE_COUNT = 8;
166	private static final int IMAGE_COUNT = 1;	42	private static final int IMAGE_COUNT = 1;
167	// private static final int MILLISECONDS_OF_DELAY = 180;	43	// private static final int MILLISECONDS_OF_DELAY = 180;
168	private Image[] imageCache;	44	private Image[] imageCache;
169	protected Image image;	45	private Image image;
170
171	protected Image animationImage;
172		46
173	// protected BusyThread busyThread;	47	// private Display dpy;
174	protected Thread busyThread;	48	// private Runnable timer;
		49	private boolean busy;
		50	// private int imageIndex;
175		51
176	/**	52	/**
177	* BusyWidget constructor comment.	53	* BusyWidget constructor comment.
Lines 182-197 Link Here
182	* int	58	* int
183	*/	59	*/
184	public BusyIndicator(Composite parent, int style) {	60	public BusyIndicator(Composite parent, int style) {
185	super(parent, style);	61	super(parent, style \| SWT.DOUBLE_BUFFERED);
		62
		63	// dpy = getDisplay();
		64	// timer = new Runnable() {
		65	// public void run () {
		66	// if (isDisposed()) return;
		67	// redraw();
		68	// if (!BusyIndicator.this.busy) return;
		69	// update();
		70	// if (isDisposed()) return;
		71	// imageIndex = (imageIndex + 1) % IMAGE_COUNT;
		72	// dpy.timerExec(MILLISECONDS_OF_DELAY, this);
		73	// }
		74	// };
186		75
187	// addPaintListener(new PaintListener() {	76	// addPaintListener(new PaintListener() {
188	// public void paintControl(PaintEvent event) {	77	// public void paintControl(PaintEvent event) {
189	// onPaint(event);	78	// onPaint(event);
190	// }	79	// }
191	// });	80	// });
		81
		82	addDisposeListener(new DisposeListener() {
		83	public void widgetDisposed(DisposeEvent e) {
		84	clearImages();
		85	}
		86	});
192	}	87	}
193		88
194	public Point computeSize(int wHint, int hHint, boolean changed) {	89	public Point computeSize(int wHint, int hHint, boolean changed) {
		90	// checkWidget();
195	Point size = new Point(0, 0);	91	Point size = new Point(0, 0);
196	if (image != null) {	92	if (image != null) {
197	Rectangle ibounds = image.getBounds();	93	Rectangle ibounds = image.getBounds();
Lines 216-249 Link Here
216	}	112	}
217		113
218	/**	114	/**
219	* Creates a thread to animate the image.
220	*/
221	protected synchronized void createBusyThread() {
222	if (busyThread != null)
223	return;
224
225	// RAP [rh] fake a busyThread that not actually used anywhere, so that the
226	// various test on busyThread != null or == null succeed
227	// Rectangle bounds = getImage(0).getBounds();
228	// Display display = getDisplay();
229	// Image offScreenImage = new Image(display, bounds.width, bounds.height);
230	// GC offScreenImageGC = new GC(offScreenImage);
231	// busyThread = new BusyThread(bounds, display, offScreenImageGC, offScreenImage);
232	// busyThread.setPriority(Thread.NORM_PRIORITY + 2);
233	// busyThread.setDaemon(true);
234	// busyThread.start();
235	busyThread = Thread.currentThread();
236	}
237
238	public void dispose() {
239	if (busyThread != null) {
240	// busyThread.setStop(true);
241	busyThread = null;
242	}
243	super.dispose();
244	}
245
246	/**
247	* Return the image or <code>null</code>.	115	* Return the image or <code>null</code>.
248	*/	116	*/
249	public Image getImage() {	117	public Image getImage() {
Lines 258-264 Link Here
258	* @return boolean	126	* @return boolean
259	*/	127	*/
260	public boolean isBusy() {	128	public boolean isBusy() {
261	return (busyThread != null);	129	return busy;
262	}	130	}
263		131
264	// /*	132	// /*
Lines 288-305 Link Here
288	* boolean	156	* boolean
289	*/	157	*/
290	public synchronized void setBusy(boolean busy) {	158	public synchronized void setBusy(boolean busy) {
291	if (busy) {	159	if (this.busy == busy) return;
292	if (busyThread == null)	160	this.busy = busy;
293	createBusyThread();	161	// imageIndex = 0;
294	} else {	162	// dpy.asyncExec(timer);
295	if (busyThread != null) {
296	// RAP [rh] no actual BusyThread implementation
297	// busyThread.setStop(true);
298	busyThread = null;
299	// RAP [rh] call clearImages explicitly as it would have been don by setStop()
300	clearImages();
301	}
302	}
303	}	163	}
304		164
305	/**	165	/**
Lines 330-336 Link Here
330	return ImageDescriptor.createFromURL(url);	190	return ImageDescriptor.createFromURL(url);
331	}	191	}
332		192
333	private synchronized Image getImage(int index) {	193	private Image getImage(int index) {
334	if (imageCache == null) {	194	if (imageCache == null) {
335	imageCache = new Image[IMAGE_COUNT];	195	imageCache = new Image[IMAGE_COUNT];
336	}	196	}
Lines 343-352 Link Here
343	return imageCache[index];	203	return imageCache[index];
344	}	204	}
345		205
346	private synchronized void clearImages() {	206	private void clearImages() {
347	// RAP [rh] missing Image#dispose() and #isDisposed()
348	if (busyThread != null)
349	return;
350	if (imageCache != null) {	207	if (imageCache != null) {
351	for (int index = 0; index < IMAGE_COUNT; index++) {	208	for (int index = 0; index < IMAGE_COUNT; index++) {
352	if (imageCache[index] != null /* && !imageCache[index].isDisposed()*/) {	209	if (imageCache[index] != null /* && !imageCache[index].isDisposed()*/) {




/*******************************************************************************
 * 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.ui.internal.forms.widgets;

import org.eclipse.swt.graphics.FontMetrics;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.widgets.Control;

public class PixelConverter {
	/**
	 * Number of horizontal dialog units per character, value <code>4</code>.
	 */
	private static final int HORIZONTAL_DIALOG_UNIT_PER_CHAR = 4;

	private FontMetrics fFontMetrics;

	public PixelConverter(Control control) {
		GC gc = new GC(control);
		gc.setFont(control.getFont());
		fFontMetrics = gc.getFontMetrics();
		gc.dispose();
	}

	public int convertHorizontalDLUsToPixels(int dlus) {
		// round to the nearest pixel
		return (fFontMetrics.getAverageCharWidth() * dlus + HORIZONTAL_DIALOG_UNIT_PER_CHAR / 2)
				/ HORIZONTAL_DIALOG_UNIT_PER_CHAR;
	}
}

Lines 1-5 Link Here

(-)src/org/eclipse/ui/internal/forms/widgets/BreakSegment.java (-2 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2005 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-38 Link Here
32	locator.rowHeight = fm.getHeight();	32	locator.rowHeight = fm.getHeight();
33	}	33	}
34	if (computeHeightOnly) locator.collectHeights();	34	if (computeHeightOnly) locator.collectHeights();
35	locator.x = locator.indent;	35	locator.resetCaret();
		36	locator.width = locator.x;
36	locator.y += locator.rowHeight;	37	locator.y += locator.rowHeight;
37	locator.rowHeight = 0;	38	locator.rowHeight = 0;
38	locator.leading = 0;	39	locator.leading = 0;

Lines 1-5 Link Here

(-)src/org/eclipse/ui/internal/forms/widgets/TextSegment.java (-7 / +13 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2009 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 java.util.Vector;	15	import java.util.Vector;
16		16
17	import org.eclipse.rwt.Adaptable;	17	import org.eclipse.rwt.Adaptable;
		18	import org.eclipse.ui.forms.internal.widgets.ITextSegmentAdapter;
		19
18	import org.eclipse.swt.SWT;	20	import org.eclipse.swt.SWT;
19	// RAP [if] unnecessary	21	// RAP [if] unnecessary
20	//import org.eclipse.swt.graphics.Color;	22	//import org.eclipse.swt.graphics.Color;
Lines 23-29 Link Here
23	import org.eclipse.swt.graphics.GC;	25	import org.eclipse.swt.graphics.GC;
24	import org.eclipse.swt.graphics.Point;	26	import org.eclipse.swt.graphics.Point;
25	import org.eclipse.swt.graphics.Rectangle;	27	import org.eclipse.swt.graphics.Rectangle;
26	import org.eclipse.ui.forms.internal.widgets.ITextSegmentAdapter;
27		28
28	import com.ibm.icu.text.BreakIterator;	29	import com.ibm.icu.text.BreakIterator;
29		30
Lines 252-260 Link Here
252	if (isSelectable())	253	if (isSelectable())
253	totalExtent+=1;	254	totalExtent+=1;
254		255
255	if (wHint != SWT.DEFAULT && totalExtent > wHint) {	256	if (wHint != SWT.DEFAULT && totalExtent + locator.marginWidth > wHint) {
256	// new line	257	// new line
257	locator.x = locator.indent;	258	locator.resetCaret();
258	locator.y += locator.rowHeight;	259	locator.y += locator.rowHeight;
259	if (computeHeightOnly)	260	if (computeHeightOnly)
260	locator.collectHeights();	261	locator.collectHeights();
Lines 266-272 Link Here
266	if (isSelectable())	267	if (isSelectable())
267	width += 1;	268	width += 1;
268	locator.x += width;	269	locator.x += width;
269	locator.width = locator.indent + width;	270	locator.width = locator.x;
270	locator.rowHeight = Math.max(locator.rowHeight, extent.y);	271	locator.rowHeight = Math.max(locator.rowHeight, extent.y);
271	// RAP [if] fm.getLeading() is missing	272	// RAP [if] fm.getLeading() is missing
272	// locator.leading = Math.max(locator.leading, fm.getLeading());	273	// locator.leading = Math.max(locator.leading, fm.getLeading());
Lines 286-292 Link Here
286	if (isSelectable())	287	if (isSelectable())
287	currentExtent += 1;	288	currentExtent += 1;
288		289
289	if (currentExtent + textFragment.length > wHint) {	290	// i != 0 \|\| locator.x > locator.getStartX() + (isSelectable() ? 1 : 0) means:
		291	// only wrap on the first fragment if we are not at the start of a line
		292	if ((i != 0 \|\| locator.x > locator.getStartX() + (isSelectable() ? 1 : 0)) && currentExtent + textFragment.length > wHint) {
290	// overflow	293	// overflow
291	int lineWidth = currentExtent;	294	int lineWidth = currentExtent;
292	locator.rowHeight = Math.max(locator.rowHeight, lineExtent.y);	295	locator.rowHeight = Math.max(locator.rowHeight, lineExtent.y);
Lines 306-311 Link Here
306	}	309	}
307	lineExtent.x += textFragment.length;	310	lineExtent.x += textFragment.length;
308	lineExtent.y = Math.max(lineHeight, lineExtent.y);	311	lineExtent.y = Math.max(lineHeight, lineExtent.y);
		312	width = Math.max (width, locator.x + lineExtent.x);
309	}	313	}
310	int lineWidth = lineExtent.x;	314	int lineWidth = lineExtent.x;
311	if (isSelectable())	315	if (isSelectable())
Lines 680-686 Link Here
680	int breakLoc = fragment.index;	684	int breakLoc = fragment.index;
681	if (breakLoc == 0)	685	if (breakLoc == 0)
682	continue;	686	continue;
683	if (locator.x + lineExtent.x + fragment.length > rightEdge) {	687	// (i != 0 \|\| locator.x > locator.getStartX() + (isSelectable() ? 1 : 0)) means:
		688	// only wrap on the first fragment if we are not at the start of a line
		689	if ((i != 0 \|\| locator.x > locator.getStartX() + (isSelectable() ? 1 : 0)) && locator.x + lineExtent.x + fragment.length > rightEdge) {
684	// overflow	690	// overflow
685	int lineWidth = locator.x + lineExtent.x;	691	int lineWidth = locator.x + lineExtent.x;
686	if (isSelectable())	692	if (isSelectable())

Lines 13-25 Link Here

(-)src/org/eclipse/ui/internal/forms/widgets/BulletParagraph.java (-1 / +2 lines)
13	import java.util.Hashtable;	13	import java.util.Hashtable;
14		14
15	import org.eclipse.rwt.Adaptable;	15	import org.eclipse.rwt.Adaptable;
		16	import org.eclipse.ui.forms.internal.widgets.IBulletParagraphAdapter;
		17
16	// RAP [if] unnecessary	18	// RAP [if] unnecessary
17	//import org.eclipse.swt.graphics.Color;	19	//import org.eclipse.swt.graphics.Color;
18	import org.eclipse.swt.graphics.GC;	20	import org.eclipse.swt.graphics.GC;
19	import org.eclipse.swt.graphics.Image;	21	import org.eclipse.swt.graphics.Image;
20	import org.eclipse.swt.graphics.Point;	22	import org.eclipse.swt.graphics.Point;
21	import org.eclipse.swt.graphics.Rectangle;	23	import org.eclipse.swt.graphics.Rectangle;
22	import org.eclipse.ui.forms.internal.widgets.IBulletParagraphAdapter;
23		24
24	public class BulletParagraph extends Paragraph implements Adaptable {	25	public class BulletParagraph extends Paragraph implements Adaptable {
25	public static final int CIRCLE = 1;	26	public static final int CIRCLE = 1;




/*******************************************************************************
 * Copyright (c) 2007, 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 java.util.HashMap;

import org.eclipse.rwt.SessionSingletonBase;
import org.eclipse.rwt.graphics.Graphics;

import org.eclipse.jface.resource.DeviceResourceException;
import org.eclipse.jface.resource.FontDescriptor;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.resource.LocalResourceManager;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Device;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.FontData;
import org.eclipse.swt.widgets.Display;

public class FormFonts {
	private static FormFonts instance;
//               reference to display
//	private static FormFonts instance;

	public static FormFonts getInstance() {
		if (instance == null)
			instance = new FormFonts();
		return instance;
//			instance = new FormFonts();
//		return instance;
	    return ( FormFonts )SessionSingletonBase.getInstance( FormFonts.class );
	}
	
	private LocalResourceManager resources;
	private HashMap descriptors;
	
	private FormFonts() {
	}
	
	private class BoldFontDescriptor extends FontDescriptor {
		private FontData[] fFontData;
		private Font fFont;
		
		BoldFontDescriptor (Font font) {
// RAP [if] Changes due to different way of creating fonts
//			fFontData = font.getFontData();
//			for (int i = 0; i < fFontData.length; i++) {
//				fFontData[i].setStyle(fFontData[i].getStyle() | SWT.BOLD);
//			}
		  FontData fontData = font.getFontData()[ 0 ];
		  Font boldFont = Graphics.getFont( fontData.getName(), 
		                                    fontData.getHeight(), 
		                                    fontData.getStyle() | SWT.BOLD );
		  fFontData = boldFont.getFontData();
		}
		
		public boolean equals(Object obj) {
			if (obj instanceof BoldFontDescriptor) {
				BoldFontDescriptor desc = (BoldFontDescriptor)obj;
				if (desc.fFontData.length != fFontData.length)
					return false;
				for (int i = 0; i < fFontData.length; i++)
					if (!fFontData[i].equals(desc.fFontData[i]))
						return false;
				return true;
			}
			return false;
		}
		
		public int hashCode() {
			int hash = 0;
			for (int i = 0; i < fFontData.length; i++)
				hash = hash * 7 + fFontData[i].hashCode();
			return hash;
	private class FontReference {
		private Font fFont;
		private int fCount;
		
		public FontReference(Font font) {
			fFont = font;
			fCount = 1;
		}

		public Font createFont(Device device) throws DeviceResourceException {
// RAP [if] Changes due to different way of creating fonts
//			return new Font(device, fFontData);
		    return Graphics.getFont( fFontData[ 0 ] );
		}

		public void destroyFont(Font previouslyCreatedFont) {
// RAP [if] unnecessary
//			previouslyCreatedFont.dispose();
		}
		public void incCount() {
			fCount++;
		}
	}
	
	public Font getBoldFont(Display display, Font font) {
		checkHashMaps();
		BoldFontDescriptor desc = new BoldFontDescriptor(font);
		Font result = getResourceManager().createFont(desc);
		descriptors.put(result, desc);
		return result;
			result.incCount();
			return result.getFont();
		}
		Font boldFont = createBoldFont(display, font);
		fonts.put(fid, new FontReference(boldFont));
		ids.put(boldFont, fid);
		return boldFont;
	}
	
	public boolean markFinished(Font boldFont) {
		checkHashMaps();
		BoldFontDescriptor desc = (BoldFontDescriptor)descriptors.get(boldFont);
		if (desc != null) {
			getResourceManager().destroyFont(desc);
			if (getResourceManager().find(desc) == null) {
				descriptors.remove(boldFont);
				validateHashMaps();
					ids.remove(ref.getFont());
// RAP [rh] Unnecessary, as there is no Font#dispose() 
//					ref.getFont().dispose();
					validateHashMaps();
				}
				return true;
			}
			return true;
			
		}
		// if the image was not found, dispose of it for the caller
// RAP [if] unnecessary
//		boldFont.dispose();
		return false;
	}
	
	private LocalResourceManager getResourceManager() {
		if (resources == null)
			resources = new LocalResourceManager(JFaceResources.getResources());
		return resources;
//			fontDatas[i].setStyle(fontDatas[i].getStyle() | SWT.BOLD);
//		}
//		return new Font(display, fontDatas);
	  FontData fontData = regularFont.getFontData()[ 0 ];
    return Graphics.getFont( fontData.getName(), 
		                         fontData.getHeight(), 
		                         fontData.getStyle() | SWT.BOLD );
	}

	private void checkHashMaps() {
		if (descriptors == null)
			descriptors = new HashMap();
		if (ids == null)
			ids = new HashMap();
	}
	
	private void validateHashMaps() {
		if (descriptors.size() == 0)
			descriptors = null;
		if (ids.size() == 0)
			ids = null;
	}
}




/*******************************************************************************
 *  Copyright (c) 2000, 2009 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.ui.internal.forms.widgets;

			return messages;
		}

		public String getDetailedMessage() {
			Control c = getMessageControl();
			if (c != null)
				return c.getToolTipText();
			return null;
		}

		public Control getMessageControl() {
			if (needHyperlink() && messageHyperlink != null)
				return messageHyperlink;




/*******************************************************************************
 * Copyright (c) 2000, 2010 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.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;

//		}
	}

	public static void processKey(int keyCode, Control c) {
		if (c.isDisposed()) {
			return;
		}
		ScrolledComposite scomp = FormUtil.getScrolledComposite(c);
		if (scomp != null) {
			if (c instanceof Combo)
				return;
			switch (keyCode) {
			case SWT.ARROW_DOWN:
				if (scomp.getData("novarrows") == null) //$NON-NLS-1$
					FormUtil.scrollVertical(scomp, false);
				break;
			case SWT.ARROW_UP:
				if (scomp.getData("novarrows") == null) //$NON-NLS-1$
					FormUtil.scrollVertical(scomp, true);
				break;
			case SWT.ARROW_LEFT:
				FormUtil.scrollHorizontal(scomp, true);
				break;
			case SWT.ARROW_RIGHT:
				FormUtil.scrollHorizontal(scomp, false);
				break;
			case SWT.PAGE_UP:
				FormUtil.scrollPage(scomp, true);
				break;
			case SWT.PAGE_DOWN:
				FormUtil.scrollPage(scomp, false);
				break;
			}
		}
	}

	public static boolean isWrapControl(Control c) {
		if ((c.getStyle() & SWT.WRAP) != 0)




/*******************************************************************************
 * Copyright (c) 2000, 2010 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 java.util.Vector;

import org.eclipse.core.runtime.ListenerList;
import org.eclipse.jface.dialogs.IPageChangeProvider;
import org.eclipse.jface.dialogs.IPageChangedListener;
import org.eclipse.jface.dialogs.PageChangedEvent;
import org.eclipse.jface.util.SafeRunnable;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;

 * 
 * @since 1.0
 */
public abstract class FormEditor extends MultiPageEditorPart  {
		IPageChangeProvider {

	/**
	 * An array of pages currently in the editor. Page objects are not limited


	private int currentPage = -1;

	private ListenerList pageListeners = new ListenerList();

	private static class FormEditorSelectionProvider extends
			MultiPageSelectionProvider {
		private ISelection globalSelection;

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.jface.dialogs.IPageChangeProvider#addPageChangedListener(org.eclipse.jface.dialogs.IPageChangedListener)
	 */
	public void addPageChangedListener(IPageChangedListener listener) {
		pageListeners.add(listener);
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.jface.dialogs.IPageChangeProvider#removePageChangedListener(org.eclipse.jface.dialogs.IPageChangedListener)
	 */
	public void removePageChangedListener(IPageChangedListener listener) {
		pageListeners.remove(listener);
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.jface.dialogs.IPageChangeProvider#getSelectedPage()
	 */
	public Object getSelectedPage() {

	public void addPage(int index, IFormPage page) throws PartInitException {
		super.addPage(index, page.getPartControl());
		configurePage(index, page);
		updatePageIndices(index+1);
	}

	/**

		} catch (PartInitException e) {
			// cannot happen for controls
		}
		updatePageIndices(index+1);
	}

	/**

					IFormPage fpage = (IFormPage) page;
					if (fpage.isDirty())
						return true;
						
				} else if (page instanceof IEditorPart) {
					IEditorPart editor = (IEditorPart) page;
					if (editor.isDirty()) {
						return true;
					}	
				}
			}
		}

			configurePage(index, (IFormPage) editor);
		else
			registerPage(index, editor);
		updatePageIndices(index+1);	
	}

	/**

				IFormPage fpage = (IFormPage) page;
				if (!fpage.isEditor())
					fpage.dispose();
				updatePageIndices();
			}
			updatePageIndices(pageIndex);
		}
		super.removePage(pageIndex);
	}

	// fix the page indices after the removal/insertion
	private void updatePageIndices(int start) {
		for (int i = start; i < pages.size(); i++) {
			Object page = pages.get(i);
			if (page instanceof IFormPage) {
				IFormPage fpage = (IFormPage) page;

		// Call super - this will cause pages to switch
		super.pageChange(newPageIndex);
		this.currentPage = newPageIndex;
		IFormPage newPage = getActivePageInstance();
		if (newPage != null)
			firePageChanged(new PageChangedEvent(this, newPage));
	}

	/**

				fpage.init(getEditorSite(), getEditorInput());
		}
	}

	private void firePageChanged(final PageChangedEvent event) {
		Object[] listeners = pageListeners.getListeners();
		for (int i = 0; i < listeners.length; ++i) {
			final IPageChangedListener l = (IPageChangedListener) listeners[i];
			SafeRunnable.run(new SafeRunnable() {
				public void run() {
					l.pageChanged(event);
				}
			});
		}
	}
}

Lines 1-5 Link Here

(-)src/org/eclipse/ui/forms/editor/FormPage.java (-2 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2005 IBM Corporation and others.	2	* Copyright (c) 2000, 2009 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 121-127 Link Here
121	if (active) {	121	if (active) {
122	// We are switching to this page - refresh it	122	// We are switching to this page - refresh it
123	// if needed.	123	// if needed.
124	mform.refresh();	124	if (mform != null)
		125	mform.refresh();
125	}	126	}
126	}	127	}
127	/**	128	/**




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


	/**
	 * Overrides <code>super</code> to create a form in which to host the tab
	 * folder. This form will be responsible for creating a common form header. 
	 * Child pages should not have a header of their own.
	 * 
	 * @param parent
	 *            the page container parent

					
					int activePage = getActivePage();
					if (SharedHeaderFormEditor.this.wasHeaderActive != wasHeaderActive && activePage != -1 && pages.get(activePage) instanceof IEditorPart) {
						
						if (wasHeaderActive) {
							deactivateSite(true, true);
						} else {
							activateSite();
						}
					}
					
					SharedHeaderFormEditor.this.wasHeaderActive = wasHeaderActive;

Lines 15-21 Link Here

(-)src/org/eclipse/ui/forms/events/IHyperlinkListener.java (-1 / +1 lines)
15	*	15	*
16	* @see org.eclipse.ui.forms.widgets.Hyperlink	16	* @see org.eclipse.ui.forms.widgets.Hyperlink
17	* @see org.eclipse.ui.forms.widgets.ImageHyperlink	17	* @see org.eclipse.ui.forms.widgets.ImageHyperlink
18	* <!-- @see org.eclipse.ui.forms.widgets.FormText -->	18	* @see org.eclipse.ui.forms.widgets.FormText
19	* @since 1.0	19	* @since 1.0
20	*/	20	*/
21	public interface IHyperlinkListener {	21	public interface IHyperlinkListener {

Line 1 Link Here

(-)readme.txt (-1 / +1 lines)
1	Based on code from dev.eclipse.org:/cvsroot/eclipse, Tag v20080407	1	Based on code from dev.eclipse.org:/cvsroot/eclipse, v20100226




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

 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Benjamin Cabe (benjamin.cabe@anyware-tech.com) - patch (see Bugzilla #255466) 
 ******************************************************************************/

package org.eclipse.ui.internal.forms;

import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Map.Entry;

import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.fieldassist.ControlDecoration;

import org.eclipse.ui.forms.IMessage;
import org.eclipse.ui.forms.IMessageManager;
import org.eclipse.ui.forms.IMessagePrefixProvider;
import org.eclipse.ui.forms.widgets.Form;
import org.eclipse.ui.forms.widgets.Hyperlink;
import org.eclipse.ui.forms.widgets.ScrolledForm;


public class MessageManager implements IMessageManager {
	private static final DefaultPrefixProvider DEFAULT_PREFIX_PROVIDER = new DefaultPrefixProvider();
	private ArrayList messages = new ArrayList();
	private ArrayList oldMessages;
	private Hashtable decorators = new Hashtable();
	private Hashtable oldDecorators;
	private boolean autoUpdate = true;
	private Form form;
	private IMessagePrefixProvider prefixProvider = DEFAULT_PREFIX_PROVIDER;
	private int decorationPosition = SWT.LEFT | SWT.BOTTOM;
	private static FieldDecoration standardError = FieldDecorationRegistry

			this.type = type;
			this.data = data;
		}
		
		private Message(Message message) {
			this.key = message.key;
			this.message = message.message;
			this.type = message.type;
			this.data = message.data;
			this.prefix = message.prefix;
			this.control = message.control;
		}

		/*
		 * (non-Javadoc)

		public String getPrefix() {
			return prefix;
		}
		
		public boolean equals(Object obj) {
			if (!(obj instanceof Message))
				return false;
			Message msg = (Message) obj;
			return (msg.getPrefix() == null ? getPrefix() == null : msg.getPrefix().equals(getPrefix())) &&
					(msg.getControl() == null ? getControl() == null : msg.getControl().equals(getControl())) &&
					(msg.getMessageType() == getMessageType()) &&
					(msg.getMessage() == null ? getMessage() == null : msg.getMessage().equals(getMessage())) &&
					msg.getKey().equals(getKey());
		}
	}

	static class DefaultPrefixProvider implements IMessagePrefixProvider {

		private String prefix;

		ControlDecorator(Control control) {
			this.decoration = new ControlDecoration(control, decorationPosition, form.getBody());
		}
		
		private ControlDecorator (ControlDecorator cd) {
			this.decoration = cd.decoration;
			this.prefix = cd.prefix;
			for (Iterator i = cd.controlMessages.iterator(); i.hasNext();)
				this.controlMessages.add(new Message((Message)i.next()));
		}

		public boolean isDisposed() {

		void updatePosition() {		
			Control control = decoration.getControl();
			decoration.dispose();
			this.decoration = new ControlDecoration(control, decorationPosition, form.getBody());
			update();
		}


				decoration.show();
			}
		}
		
		public boolean equals(Object obj) {
			if (!(obj instanceof ControlDecorator))
				return false;
			ControlDecorator cd = (ControlDecorator) obj;
			if (!cd.decoration.equals(decoration))
				return false;
			return cd.getPrefix().equals(getPrefix());
		}
		
		boolean hasSameMessages(ControlDecorator cd) {
			if (cd.controlMessages.size() != controlMessages.size())
				return false;
			if (!cd.controlMessages.containsAll(controlMessages))
				return false;
			return true;
		}
	}

	/**

	 *            the form to control
	 */
	public MessageManager(ScrolledForm scrolledForm) {
		this.form = scrolledForm.getForm();
	}
	
	/**
	 * Creates a new instance of the message manager that will work with the
	 * provided form.
	 * 
	 * @param form
	 *            the form to control
	 */
	public MessageManager(Form form) {
		this.form = form;
	}

	/*


	private void update(ArrayList mergedList) {
		pruneControlDecorators();
		if (form.getHead().getBounds().height == 0 || mergedList.isEmpty() || mergedList == null) {
			form.setMessage(null, IMessageProvider.NONE);
			return;
		}
		ArrayList peers = createPeers(mergedList);

			// a single message
			IMessage message = (IMessage) peers.get(0);
			messageText = message.getMessage();
			form.setMessage(messageText, maxType, array);
		} else {
			// show a summary message for the message
			// and list of errors for the details

						new String[] { peers.size() + "" }); //$NON-NLS-1$
			else
				messageText = SINGLE_MESSAGE_SUMMARY_KEYS[maxType];
			form.setMessage(messageText, maxType, array);
		}
	}


	 * @see org.eclipse.ui.forms.IMessageManager#setAutoUpdate(boolean)
	 */
	public void setAutoUpdate(boolean autoUpdate) {
		boolean needsCaching = this.autoUpdate && !autoUpdate;
		boolean needsUpdate = !this.autoUpdate && autoUpdate;
		this.autoUpdate = autoUpdate;
		if (needsUpdate && isCacheChanged())
			update();
		if (needsCaching) {
			oldMessages = new ArrayList();
			for (Iterator i = messages.iterator(); i.hasNext();)
				oldMessages.add(new Message((Message)i.next()));
			oldDecorators = new Hashtable();
			for (Enumeration e = decorators.keys(); e.hasMoreElements();) {
				Object key = e.nextElement();
				oldDecorators.put(key, new ControlDecorator((ControlDecorator)decorators.get(key)));
			}
		}
	}
	
	private boolean isCacheChanged() {
		boolean result = false;
		result = checkMessageCache() || checkDecoratorCache();
		oldMessages.clear();
		oldMessages = null;
		oldDecorators.clear();
		oldDecorators = null;
		return result;
	}
	
	private boolean checkMessageCache() {
		if (oldMessages == null)
			return false;
		if (messages.size() != oldMessages.size())
			return true;
		if (!oldMessages.containsAll(messages))
			return true;
		return false;
	}
	
	private boolean checkDecoratorCache() {
		if (oldDecorators == null)
			return false;
		for (Iterator i = decorators.entrySet().iterator(); i.hasNext();) {
			Entry next = (Entry)i.next();
			ControlDecorator cd = (ControlDecorator)next.getValue();
			ControlDecorator oldCd = (ControlDecorator) oldDecorators.get(cd.decoration.getControl());
			if ((oldCd == null && cd.controlMessages.size() > 0) || (oldCd != null && !cd.hasSameMessages(oldCd)))
				return true;
		}
		return false;
	}
}




/*******************************************************************************
 * 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.ui.internal.forms;

import org.eclipse.ui.internal.forms.widgets.FormsResources;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;

public class FormsPlugin extends AbstractUIPlugin {

	public FormsPlugin() {
	}
	
	public void stop(BundleContext context) throws Exception {
		try {
			FormsResources.shutdown();
		} finally {
			super.stop(context);
		}
	}

}

Return to bug 303731

Lines 1-5 Link Here

(-)src/org/eclipse/ui/internal/forms/widgets/FormUtil.java (-32 / +34 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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-28 Link Here
22	import org.eclipse.swt.graphics.Point;	22	import org.eclipse.swt.graphics.Point;
23	import org.eclipse.swt.graphics.Rectangle;	23	import org.eclipse.swt.graphics.Rectangle;
24	import org.eclipse.swt.layout.GridData;	24	import org.eclipse.swt.layout.GridData;
25	//import org.eclipse.swt.widgets.Combo;	25	import org.eclipse.swt.widgets.Combo;
26	import org.eclipse.swt.widgets.Composite;	26	import org.eclipse.swt.widgets.Composite;
27	import org.eclipse.swt.widgets.Control;	27	import org.eclipse.swt.widgets.Control;
28	import org.eclipse.swt.widgets.Label;	28	import org.eclipse.swt.widgets.Label;
Lines 376-411 Link Here
376	// }	376	// }
377	}	377	}
378		378
379	// RAP [rh] FormUtil#processKey unnecessary	379	public static void processKey(int keyCode, Control c) {
380	// public static void processKey(int keyCode, Control c) {	380	if (c.isDisposed()) {
381	// ScrolledComposite scomp = FormUtil.getScrolledComposite(c);	381	return;
382	// if (scomp != null) {	382	}
383	// if (c instanceof Combo)	383	ScrolledComposite scomp = FormUtil.getScrolledComposite(c);
384	// return;	384	if (scomp != null) {
385	// switch (keyCode) {	385	if (c instanceof Combo)
386	// case SWT.ARROW_DOWN:	386	return;
387	// if (scomp.getData("novarrows") == null) //$NON-NLS-1$	387	switch (keyCode) {
388	// FormUtil.scrollVertical(scomp, false);	388	case SWT.ARROW_DOWN:
389	// break;	389	if (scomp.getData("novarrows") == null) //$NON-NLS-1$
390	// case SWT.ARROW_UP:	390	FormUtil.scrollVertical(scomp, false);
391	// if (scomp.getData("novarrows") == null) //$NON-NLS-1$	391	break;
392	// FormUtil.scrollVertical(scomp, true);	392	case SWT.ARROW_UP:
393	// break;	393	if (scomp.getData("novarrows") == null) //$NON-NLS-1$
394	// case SWT.ARROW_LEFT:	394	FormUtil.scrollVertical(scomp, true);
395	// FormUtil.scrollHorizontal(scomp, true);	395	break;
396	// break;	396	case SWT.ARROW_LEFT:
397	// case SWT.ARROW_RIGHT:	397	FormUtil.scrollHorizontal(scomp, true);
398	// FormUtil.scrollHorizontal(scomp, false);	398	break;
399	// break;	399	case SWT.ARROW_RIGHT:
400	// case SWT.PAGE_UP:	400	FormUtil.scrollHorizontal(scomp, false);
401	// FormUtil.scrollPage(scomp, true);	401	break;
402	// break;	402	case SWT.PAGE_UP:
403	// case SWT.PAGE_DOWN:	403	FormUtil.scrollPage(scomp, true);
404	// FormUtil.scrollPage(scomp, false);	404	break;
405	// break;	405	case SWT.PAGE_DOWN:
406	// }	406	FormUtil.scrollPage(scomp, false);
407	// }	407	break;
408	// }	408	}
		409	}
		410	}
409		411
410	public static boolean isWrapControl(Control c) {	412	public static boolean isWrapControl(Control c) {
411	if ((c.getStyle() & SWT.WRAP) != 0)	413	if ((c.getStyle() & SWT.WRAP) != 0)

Lines 1-5 Link Here

(-)src/org/eclipse/ui/forms/MasterDetailsBlock.java (-8 / +56 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2009 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 7-12 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Roland Tepp (roland@videobet.com) - patch (see Bugzilla #107197)
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.ui.forms;	12	package org.eclipse.ui.forms;
12		13
Lines 141-156 Link Here
141	*/	142	*/
142	public void createContent(IManagedForm managedForm) {	143	public void createContent(IManagedForm managedForm) {
143	final ScrolledForm form = managedForm.getForm();	144	final ScrolledForm form = managedForm.getForm();
		145	createContent(managedForm, form.getBody());
		146	}
		147
		148	/**
		149	* Creates the content of the master/details block inside the parent composite.
		150	* This method should be called as late as possible inside the parent part.
		151	*
		152	* @param managedForm
		153	* the managed form to create the block in
		154	*/
		155	public void createContent(IManagedForm managedForm, Composite parent) {
		156	final ScrolledForm form = managedForm.getForm();
144	FormToolkit toolkit = managedForm.getToolkit();	157	FormToolkit toolkit = managedForm.getToolkit();
145	GridLayout layout = new GridLayout();	158	applyLayout(parent);
146	layout.marginWidth = 0;	159	sashForm = new MDSashForm(parent, SWT.NULL);
147	layout.marginHeight = 0;
148	form.getBody().setLayout(layout);
149	sashForm = new MDSashForm(form.getBody(), SWT.NULL);
150	sashForm.setData("form", managedForm); //$NON-NLS-1$	160	sashForm.setData("form", managedForm); //$NON-NLS-1$
151	toolkit.adapt(sashForm, false, false);	161	toolkit.adapt(sashForm, false, false);
152	sashForm.setMenu(form.getBody().getMenu());	162	sashForm.setMenu(parent.getMenu());
153	sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));	163	applyLayoutData(sashForm);
154	createMasterPart(managedForm, sashForm);	164	createMasterPart(managedForm, sashForm);
155	createDetailsPart(managedForm, sashForm);	165	createDetailsPart(managedForm, sashForm);
156	hookResizeListener();	166	hookResizeListener();
Lines 158-163 Link Here
158	form.updateToolBar();	168	form.updateToolBar();
159	}	169	}
160		170
		171	/**
		172	* Applies layout data to the sash form containing master and detail parts
		173	* of the master/details block.
		174	*
		175	* <p>The default implementation fills the whole parent composite area.
		176	* Override this method if master/details block is to be placed on a form
		177	* along with other components.</p>
		178	*
		179	* <p>Implementations that override this method should also override
		180	* <code>applyLayout(Composite)</code> method implementation.</p>
		181	*
		182	* @param sashForm The sash form to be laid out on the parent composite.
		183	* @see #applyLayout(Composite)
		184	*/
		185	protected void applyLayoutData(SashForm sashForm) {
		186	sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
		187	}
		188
		189	/**
		190	* Applies layout to the parent composite of the master/details block.
		191	*
		192	* <p>The default implementation fills the whole parent composite area.
		193	* Override this method if master/details block is to be placed on a form
		194	* along with other components.</p>
		195	*
		196	* <p>Implementations that override this method should also override
		197	* <code>applyLayoutData(SashForm)</code> method implementation.</p>
		198	*
		199	* @param parent parent composite for the master/details block
		200	* @see #applyLayoutData(SashForm)
		201	*/
		202	protected void applyLayout(final Composite parent) {
		203	GridLayout layout = new GridLayout();
		204	layout.marginWidth = 0;
		205	layout.marginHeight = 0;
		206	parent.setLayout(layout);
		207	}
		208
161	private void hookResizeListener() {	209	private void hookResizeListener() {
162	Listener listener = ((MDSashForm)sashForm).listener;	210	Listener listener = ((MDSashForm)sashForm).listener;
163	Control [] children = sashForm.getChildren();	211	Control [] children = sashForm.getChildren();

Lines 1-11 Link Here

(-)src/org/eclipse/ui/forms/HyperlinkSettings.java (-7 / +8 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2005 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
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	*******************************************************************************/
11	package org.eclipse.ui.forms;	11	package org.eclipse.ui.forms;
Lines 16-25 Link Here
16	import org.eclipse.ui.internal.forms.widgets.*;	16	import org.eclipse.ui.internal.forms.widgets.*;
17	/**	17	/**
18	* Manages color and underline mode settings for a group of hyperlinks. The	18	* Manages color and underline mode settings for a group of hyperlinks. The
19	* class is extended by HyperlinkGroup but is otwerwise not intended to be	19	* class is extended by HyperlinkGroup but is otherwise not intended to be
20	* subclassed.	20	* subclassed.
21	*	21	*
22	* @since 1.0	22	* @since 1.0
		23	* @noextend This class is not intended to be subclassed by clients.
23	*/	24	*/
24	public class HyperlinkSettings {	25	public class HyperlinkSettings {
25	/**	26	/**

Lines 1-5 Link Here

(-)src/org/eclipse/ui/forms/ManagedForm.java (-8 / +4 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-20 Link Here
13	import java.util.Vector;	13	import java.util.Vector;
14	import org.eclipse.jface.viewers.ISelection;	14	import org.eclipse.jface.viewers.ISelection;
15	import org.eclipse.swt.widgets.Composite;	15	import org.eclipse.swt.widgets.Composite;
16	import org.eclipse.ui.forms.widgets.*;	16	import org.eclipse.ui.forms.widgets.FormToolkit;
17	import org.eclipse.ui.internal.forms.MessageManager;	17	import org.eclipse.ui.forms.widgets.ScrolledForm;
18		18
19	/**	19	/**
20	* Managed form wraps a form widget and adds life cycle methods for form parts.	20	* Managed form wraps a form widget and adds life cycle methods for form parts.
Lines 47-54 Link Here
47		47
48	private boolean initialized;	48	private boolean initialized;
49		49
50	private MessageManager messageManager;
51
52	private Vector parts = new Vector();	50	private Vector parts = new Vector();
53		51
54	/**	52	/**
Lines 328-335 Link Here
328	* @see org.eclipse.ui.forms.IManagedForm#getMessageManager()	326	* @see org.eclipse.ui.forms.IManagedForm#getMessageManager()
329	*/	327	*/
330	public IMessageManager getMessageManager() {	328	public IMessageManager getMessageManager() {
331	if (messageManager == null)	329	return form.getMessageManager();
332	messageManager = new MessageManager(form);
333	return messageManager;
334	}	330	}
335	}	331	}

Lines 1-5 Link Here

(-)src/org/eclipse/ui/forms/widgets/ExpandableComposite.java (-52 / +63 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2009 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 8-13 Link Here
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Kai Nacke - Fix for Bug 202382	10	* Kai Nacke - Fix for Bug 202382
		11	* Bryan Hunt - Fix for Bug 245457
11	*******************************************************************************/	12	*******************************************************************************/
12	package org.eclipse.ui.forms.widgets;	13	package org.eclipse.ui.forms.widgets;
13		14
Lines 16-23 Link Here
16	import org.eclipse.swt.SWT;	17	import org.eclipse.swt.SWT;
17	//import org.eclipse.swt.events.FocusEvent;	18	//import org.eclipse.swt.events.FocusEvent;
18	//import org.eclipse.swt.events.FocusListener;	19	//import org.eclipse.swt.events.FocusListener;
19	//import org.eclipse.swt.events.KeyAdapter;	20	import org.eclipse.swt.events.KeyAdapter;
20	//import org.eclipse.swt.events.KeyEvent;	21	import org.eclipse.swt.events.KeyEvent;
21	//import org.eclipse.swt.events.PaintEvent;	22	//import org.eclipse.swt.events.PaintEvent;
22	//import org.eclipse.swt.events.PaintListener;	23	//import org.eclipse.swt.events.PaintListener;
23	//import org.eclipse.swt.events.TraverseEvent;	24	//import org.eclipse.swt.events.TraverseEvent;
Lines 53-64 Link Here
53	* The widget can be instantiated as-is, or subclassed to modify some aspects of	54	* The widget can be instantiated as-is, or subclassed to modify some aspects of
54	* it. *	55	* it. *
55	* <p>	56	* <p>
56	* <!-- RAP [rh] no key events
57	* Since 3.1, left/right arrow keys can be used to control the expansion state.	57	* Since 3.1, left/right arrow keys can be used to control the expansion state.
58	* If several expandable composites are created in the same parent, up/down	58	* If several expandable composites are created in the same parent, up/down
59	* arrow keys can be used to traverse between them. Expandable text accepts	59	* arrow keys can be used to traverse between them. Expandable text accepts
60	* mnemonics and mnemonic activation will toggle the expansion state.	60	* mnemonics and mnemonic activation will toggle the expansion state.
61	* -->
62	*	61	*
63	* <p>	62	* <p>
64	* While expandable composite recognize that different styles can be used to	63	* While expandable composite recognize that different styles can be used to
Lines 132-137 Link Here
132	* be positioned after the text control and vertically centered with it.	131	* be positioned after the text control and vertically centered with it.
133	*/	132	*/
134	public static final int LEFT_TEXT_CLIENT_ALIGNMENT = 1 << 13;	133	public static final int LEFT_TEXT_CLIENT_ALIGNMENT = 1 << 13;
		134
		135	/**
		136	* By default, a focus box is painted around the title when it receives focus.
		137	* If this style is used, the focus box will not be painted. This style does
		138	* not apply when FOCUS_TITLE is used.
		139	*/
		140	public static final int NO_TITLE_FOCUS_BOX = 1 << 14;
135		141
136	/**	142	/**
137	* Width of the margin that will be added around the control (default is 0).	143	* Width of the margin that will be added around the control (default is 0).
Lines 266-274 Link Here
266	size = textLabelCache.computeSize(SWT.DEFAULT, SWT.DEFAULT);	272	size = textLabelCache.computeSize(SWT.DEFAULT, SWT.DEFAULT);
267	if (twidth < size.x + IGAP + tcsize.x) {	273	if (twidth < size.x + IGAP + tcsize.x) {
268	twidth -= IGAP;	274	twidth -= IGAP;
269	if (textLabel instanceof Label)	275	if (textLabel instanceof Label) {
270	size = FormUtil.computeWrapSize(new GC(textLabel), ((Label)textLabel).getText(), Math.round(twidth*(size.x/(float)(size.x+tcsize.x))));	276	GC gc = new GC(textLabel);
271	else	277	size = FormUtil.computeWrapSize(gc, ((Label)textLabel).getText(), Math.round(twidth*(size.x/(float)(size.x+tcsize.x))));
		278	gc.dispose();
		279	} else
272	size = textLabelCache.computeSize(Math.round(twidth*(size.x/(float)(size.x+tcsize.x))), SWT.DEFAULT);	280	size = textLabelCache.computeSize(Math.round(twidth*(size.x/(float)(size.x+tcsize.x))), SWT.DEFAULT);
273	tcsize = textClientCache.computeSize(twidth-size.x, SWT.DEFAULT);	281	tcsize = textClientCache.computeSize(twidth-size.x, SWT.DEFAULT);
274	}	282	}
Lines 406-414 Link Here
406	size = textLabelCache.computeSize(SWT.DEFAULT, SWT.DEFAULT);	414	size = textLabelCache.computeSize(SWT.DEFAULT, SWT.DEFAULT);
407	if (innertHint != SWT.DEFAULT && innertHint < size.x + IGAP + tcsize.x) {	415	if (innertHint != SWT.DEFAULT && innertHint < size.x + IGAP + tcsize.x) {
408	innertHint -= IGAP;	416	innertHint -= IGAP;
409	if (textLabel instanceof Label)	417	if (textLabel instanceof Label) {
410	size = FormUtil.computeWrapSize(new GC(textLabel), ((Label)textLabel).getText(), Math.round(innertHint*(size.x/(float)(size.x+tcsize.x))));	418	GC gc = new GC(textLabel);
411	else	419	size = FormUtil.computeWrapSize(gc, ((Label)textLabel).getText(), Math.round(innertHint*(size.x/(float)(size.x+tcsize.x))));
		420	gc.dispose();
		421	} else
412	size = textLabelCache.computeSize(Math.round(innertHint*(size.x/(float)(size.x+tcsize.x))), SWT.DEFAULT);	422	size = textLabelCache.computeSize(Math.round(innertHint*(size.x/(float)(size.x+tcsize.x))), SWT.DEFAULT);
413	tcsize = textClientCache.computeSize(innertHint-size.x, SWT.DEFAULT);	423	tcsize = textClientCache.computeSize(innertHint-size.x, SWT.DEFAULT);
414	}	424	}
Lines 555-561 Link Here
555	toggleState();	565	toggleState();
556	}	566	}
557	});	567	});
558	// RAP [rh] missing paint and key events	568	// RAP [rh] missing paint
559	// toggle.addPaintListener(new PaintListener() {	569	// toggle.addPaintListener(new PaintListener() {
560	// public void paintControl(PaintEvent e) {	570	// public void paintControl(PaintEvent e) {
561	// if (textLabel instanceof Label && !isFixedStyle())	571	// if (textLabel instanceof Label && !isFixedStyle())
Lines 564-580 Link Here
564	// : getTitleBarForeground());	574	// : getTitleBarForeground());
565	// }	575	// }
566	// });	576	// });
567	// toggle.addKeyListener(new KeyAdapter() {	577	toggle.addKeyListener(new KeyAdapter() {
568	// public void keyPressed(KeyEvent e) {	578	public void keyPressed(KeyEvent e) {
569	// if (e.keyCode == SWT.ARROW_UP) {	579	if (e.keyCode == SWT.ARROW_UP) {
570	// verticalMove(false);	580	verticalMove(false);
571	// e.doit = false;	581	e.doit = false;
572	// } else if (e.keyCode == SWT.ARROW_DOWN) {	582	} else if (e.keyCode == SWT.ARROW_DOWN) {
573	// verticalMove(true);	583	verticalMove(true);
574	// e.doit = false;	584	e.doit = false;
575	// }	585	}
576	// }	586	}
577	// });	587	});
578	// RAP [rh] Unnecessary to add focus listener, focus-border must be handled	588	// RAP [rh] Unnecessary to add focus listener, focus-border must be handled
579	// on the client-side	589	// on the client-side
580	// if ((getExpansionStyle()&FOCUS_TITLE)==0) {	590	// if ((getExpansionStyle()&FOCUS_TITLE)==0) {
Lines 1018-1025 Link Here
1018	* the title bar foreground	1028	* the title bar foreground
1019	*/	1029	*/
1020	public void setTitleBarForeground(Color color) {	1030	public void setTitleBarForeground(Color color) {
1021	titleBarForeground = color;	1031	if (hasTitleBar())
1022	textLabel.setForeground(color);	1032	titleBarForeground = color;
		1033	if (textLabel != null)
		1034	textLabel.setForeground(color);
1023	}	1035	}
1024		1036
1025	/**	1037	/**
Lines 1057-1089 Link Here
1057	}	1069	}
1058	}	1070	}
1059		1071
1060	// RAP [rh] Obsolete, as there are no mouse events	1072	private void verticalMove(boolean down) {
1061	// private void verticalMove(boolean down) {	1073	Composite parent = getParent();
1062	// Composite parent = getParent();	1074	Control[] children = parent.getChildren();
1063	// Control[] children = parent.getChildren();	1075	for (int i = 0; i < children.length; i++) {
1064	// for (int i = 0; i < children.length; i++) {	1076	Control child = children[i];
1065	// Control child = children[i];	1077	if (child == this) {
1066	// if (child == this) {	1078	ExpandableComposite sibling = getSibling(children, i, down);
1067	// ExpandableComposite sibling = getSibling(children, i, down);	1079	if (sibling != null && sibling.toggle != null) {
1068	// if (sibling != null && sibling.toggle != null) {	1080	sibling.setFocus();
1069	// sibling.setFocus();	1081	}
1070	// }	1082	break;
1071	// break;	1083	}
1072	// }	1084	}
1073	// }	1085	}
1074	// }	1086
1075	//	1087	private ExpandableComposite getSibling(Control[] children, int index,
1076	// private ExpandableComposite getSibling(Control[] children, int index,	1088	boolean down) {
1077	// boolean down) {	1089	int loc = down ? index + 1 : index - 1;
1078	// int loc = down ? index + 1 : index - 1;	1090	while (loc >= 0 && loc < children.length) {
1079	// while (loc >= 0 && loc < children.length) {	1091	Control c = children[loc];
1080	// Control c = children[loc];	1092	if (c instanceof ExpandableComposite && c.isVisible())
1081	// if (c instanceof ExpandableComposite && c.isVisible())	1093	return (ExpandableComposite) c;
1082	// return (ExpandableComposite) c;	1094	loc = down ? loc + 1 : loc - 1;
1083	// loc = down ? loc + 1 : loc - 1;	1095	}
1084	// }	1096	return null;
1085	// return null;	1097	}
1086	// }
1087		1098
1088	private void programmaticToggleState() {	1099	private void programmaticToggleState() {
1089	if (toggle != null)	1100	if (toggle != null)

Lines 1-11 Link Here

(-)src/org/eclipse/ui/forms/widgets/TreeNode.java (-6 / +11 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
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	*******************************************************************************/
11	package org.eclipse.ui.forms.widgets;	11	package org.eclipse.ui.forms.widgets;
Lines 22-27 Link Here
22	* The control is rendered as box with a '+' or '-' sign, depending on the	22	* The control is rendered as box with a '+' or '-' sign, depending on the
23	* expansion state. Focus indication is rendered around the box when the	23	* expansion state. Focus indication is rendered around the box when the
24	* control has keyboard focus.	24	* control has keyboard focus.
		25	* <p>
		26	* <dl>
		27	* <dt><b>Styles:</b></dt>
		28	* <dd>None</dd>
		29	* </dl>
25	*	30	*
26	* @see Twistie	31	* @see Twistie
27	* @since 1.0	32	* @since 1.0

Lines 1-11 Link Here

(-)src/org/eclipse/ui/forms/widgets/Twistie.java (-6 / +11 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2005 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
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	*******************************************************************************/
11	package org.eclipse.ui.forms.widgets;	11	package org.eclipse.ui.forms.widgets;
Lines 24-29 Link Here
24	* <p>	24	* <p>
25	* The control is rendered as a triangle that points to the right in the	25	* The control is rendered as a triangle that points to the right in the
26	* collapsed and down in the expanded state. Triangle color can be changed.	26	* collapsed and down in the expanded state. Triangle color can be changed.
		27	* <p>
		28	* <dl>
		29	* <dt><b>Styles:</b></dt>
		30	* <dd>None</dd>
		31	* </dl>
27	*	32	*
28	* @see TreeNode	33	* @see TreeNode
29	* @since 1.0	34	* @since 1.0

Lines 1-5 Link Here

(-)src/org/eclipse/ui/forms/widgets/ColumnLayout.java (-2 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2009 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 8-13 Link Here
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* dinko.ivanov@sap.com - patch #70790	10	* dinko.ivanov@sap.com - patch #70790
		11	* RasmussenJamie@comcast.net - patch for Bug 184345
11	*******************************************************************************/	12	*******************************************************************************/
12	package org.eclipse.ui.forms.widgets;	13	package org.eclipse.ui.forms.widgets;
13	import org.eclipse.swt.SWT;	14	import org.eclipse.swt.SWT;
Lines 185-191 Link Here
185	cwidth = Math.max(cwidth, sizes[i].x);	186	cwidth = Math.max(cwidth, sizes[i].x);
186	cheight += sizes[i].y;	187	cheight += sizes[i].y;
187	}	188	}
188	int ncolumns = (carea.width - leftMargin - rightMargin - horizontalSpacing) / (cwidth + horizontalSpacing);	189	int ncolumns = (carea.width - leftMargin - rightMargin + horizontalSpacing) / (cwidth + horizontalSpacing);
189	ncolumns = Math.min(ncolumns, children.length);	190	ncolumns = Math.min(ncolumns, children.length);
190	ncolumns = Math.max(ncolumns, minNumColumns);	191	ncolumns = Math.max(ncolumns, minNumColumns);
191	ncolumns = Math.min(ncolumns, maxNumColumns);	192	ncolumns = Math.min(ncolumns, maxNumColumns);

Lines 1-11 Link Here

(-)src/org/eclipse/ui/forms/widgets/Section.java (-8 / +9 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2009 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
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	* Michael Williamson (eclipse-bugs@magnaworks.com) - patch (see Bugzilla #92545)	10	* Michael Williamson (eclipse-bugs@magnaworks.com) - patch (see Bugzilla #92545)
11	*	11	*
Lines 27-32 Link Here
27	import org.eclipse.swt.widgets.Control;	27	import org.eclipse.swt.widgets.Control;
28	import org.eclipse.swt.widgets.Event;	28	import org.eclipse.swt.widgets.Event;
29	import org.eclipse.swt.widgets.Listener;	29	import org.eclipse.swt.widgets.Listener;
		30	import org.eclipse.swt.widgets.Shell;
30	import org.eclipse.swt.widgets.Text;	31	import org.eclipse.swt.widgets.Text;
31	import org.eclipse.ui.internal.forms.widgets.FormImages;	32	import org.eclipse.ui.internal.forms.widgets.FormImages;
32	//import org.eclipse.ui.internal.forms.widgets.FormUtil;	33	//import org.eclipse.ui.internal.forms.widgets.FormUtil;
Lines 130-136 Link Here
130	while (c != null) {	131	while (c != null) {
131	c.setRedraw(false);	132	c.setRedraw(false);
132	c = c.getParent();	133	c = c.getParent();
133	if (c instanceof SharedScrolledComposite) {	134	if (c instanceof SharedScrolledComposite \|\| c instanceof Shell) {
134	break;	135	break;
135	}	136	}
136	}	137	}
Lines 147-153 Link Here
147	while (c != null) {	148	while (c != null) {
148	c.setRedraw(true);	149	c.setRedraw(true);
149	c = c.getParent();	150	c = c.getParent();
150	if (c instanceof SharedScrolledComposite) {	151	if (c instanceof SharedScrolledComposite \|\| c instanceof Shell) {
151	break;	152	break;
152	}	153	}
153	}	154	}

Lines 1-5 Link Here

(-)src/org/eclipse/ui/forms/editor/FormEditor.java (-47 / +15 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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 12-22 Link Here
12		12
13	import java.util.Vector;	13	import java.util.Vector;
14		14
15	import org.eclipse.core.runtime.ListenerList;
16	import org.eclipse.jface.dialogs.IPageChangeProvider;
17	import org.eclipse.jface.dialogs.IPageChangedListener;
18	import org.eclipse.jface.dialogs.PageChangedEvent;
19	import org.eclipse.jface.util.SafeRunnable;
20	import org.eclipse.jface.viewers.ISelection;	15	import org.eclipse.jface.viewers.ISelection;
21	import org.eclipse.jface.viewers.ISelectionProvider;	16	import org.eclipse.jface.viewers.ISelectionProvider;
22	import org.eclipse.jface.viewers.SelectionChangedEvent;	17	import org.eclipse.jface.viewers.SelectionChangedEvent;
Lines 58-65 Link Here
58	*	53	*
59	* @since 1.0	54	* @since 1.0
60	*/	55	*/
61	public abstract class FormEditor extends MultiPageEditorPart implements	56	public abstract class FormEditor extends MultiPageEditorPart {
62	IPageChangeProvider {
63		57
64	/**	58	/**
65	* An array of pages currently in the editor. Page objects are not limited	59	* An array of pages currently in the editor. Page objects are not limited
Lines 74-81 Link Here
74		68
75	private int currentPage = -1;	69	private int currentPage = -1;
76		70
77	private ListenerList pageListeners = new ListenerList();
78
79	private static class FormEditorSelectionProvider extends	71	private static class FormEditorSelectionProvider extends
80	MultiPageSelectionProvider {	72	MultiPageSelectionProvider {
81	private ISelection globalSelection;	73	private ISelection globalSelection;
Lines 179-202 Link Here
179	/*	171	/*
180	* (non-Javadoc)	172	* (non-Javadoc)
181	*	173	*
182	* @see org.eclipse.jface.dialogs.IPageChangeProvider#addPageChangedListener(org.eclipse.jface.dialogs.IPageChangedListener)
183	*/
184	public void addPageChangedListener(IPageChangedListener listener) {
185	pageListeners.add(listener);
186	}
187
188	/*
189	* (non-Javadoc)
190	*
191	* @see org.eclipse.jface.dialogs.IPageChangeProvider#removePageChangedListener(org.eclipse.jface.dialogs.IPageChangedListener)
192	*/
193	public void removePageChangedListener(IPageChangedListener listener) {
194	pageListeners.remove(listener);
195	}
196
197	/*
198	* (non-Javadoc)
199	*
200	* @see org.eclipse.jface.dialogs.IPageChangeProvider#getSelectedPage()	174	* @see org.eclipse.jface.dialogs.IPageChangeProvider#getSelectedPage()
201	*/	175	*/
202	public Object getSelectedPage() {	176	public Object getSelectedPage() {
Lines 230-235 Link Here
230	public void addPage(int index, IFormPage page) throws PartInitException {	204	public void addPage(int index, IFormPage page) throws PartInitException {
231	super.addPage(index, page.getPartControl());	205	super.addPage(index, page.getPartControl());
232	configurePage(index, page);	206	configurePage(index, page);
		207	updatePageIndices(index+1);
233	}	208	}
234		209
235	/**	210	/**
Lines 266-271 Link Here
266	} catch (PartInitException e) {	241	} catch (PartInitException e) {
267	// cannot happen for controls	242	// cannot happen for controls
268	}	243	}
		244	updatePageIndices(index+1);
269	}	245	}
270		246
271	/**	247	/**
Lines 285-290 Link Here
285	IFormPage fpage = (IFormPage) page;	261	IFormPage fpage = (IFormPage) page;
286	if (fpage.isDirty())	262	if (fpage.isDirty())
287	return true;	263	return true;
		264
		265	} else if (page instanceof IEditorPart) {
		266	IEditorPart editor = (IEditorPart) page;
		267	if (editor.isDirty()) {
		268	return true;
		269	}
288	}	270	}
289	}	271	}
290	}	272	}
Lines 340-345 Link Here
340	configurePage(index, (IFormPage) editor);	322	configurePage(index, (IFormPage) editor);
341	else	323	else
342	registerPage(index, editor);	324	registerPage(index, editor);
		325	updatePageIndices(index+1);
343	}	326	}
344		327
345	/**	328	/**
Lines 374-388 Link Here
374	IFormPage fpage = (IFormPage) page;	357	IFormPage fpage = (IFormPage) page;
375	if (!fpage.isEditor())	358	if (!fpage.isEditor())
376	fpage.dispose();	359	fpage.dispose();
377	updatePageIndices();
378	}	360	}
		361	updatePageIndices(pageIndex);
379	}	362	}
380	super.removePage(pageIndex);	363	super.removePage(pageIndex);
381	}	364	}
382		365
383	// fix the page indices after the removal	366	// fix the page indices after the removal/insertion
384	private void updatePageIndices() {	367	private void updatePageIndices(int start) {
385	for (int i = 0; i < pages.size(); i++) {	368	for (int i = start; i < pages.size(); i++) {
386	Object page = pages.get(i);	369	Object page = pages.get(i);
387	if (page instanceof IFormPage) {	370	if (page instanceof IFormPage) {
388	IFormPage fpage = (IFormPage) page;	371	IFormPage fpage = (IFormPage) page;
Lines 503-511 Link Here
503	// Call super - this will cause pages to switch	486	// Call super - this will cause pages to switch
504	super.pageChange(newPageIndex);	487	super.pageChange(newPageIndex);
505	this.currentPage = newPageIndex;	488	this.currentPage = newPageIndex;
506	IFormPage newPage = getActivePageInstance();
507	if (newPage != null)
508	firePageChanged(new PageChangedEvent(this, newPage));
509	}	489	}
510		490
511	/**	491	/**
Lines 672-687 Link Here
672	fpage.init(getEditorSite(), getEditorInput());	652	fpage.init(getEditorSite(), getEditorInput());
673	}	653	}
674	}	654	}
675
676	private void firePageChanged(final PageChangedEvent event) {
677	Object[] listeners = pageListeners.getListeners();
678	for (int i = 0; i < listeners.length; ++i) {
679	final IPageChangedListener l = (IPageChangedListener) listeners[i];
680	SafeRunnable.run(new SafeRunnable() {
681	public void run() {
682	l.pageChanged(event);
683	}
684	});
685	}
686	}
687	}	655	}

Lines 1-5 Link Here

(-)src/org/eclipse/ui/forms/editor/SharedHeaderFormEditor.java (-8 / +9 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2009 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 65-71 Link Here
65		65
66	/**	66	/**
67	* Overrides <code>super</code> to create a form in which to host the tab	67	* Overrides <code>super</code> to create a form in which to host the tab
68	* folder. This form will be responsible for managing	68	* folder. This form will be responsible for creating a common form header.
		69	* Child pages should not have a header of their own.
69	*	70	*
70	* @param parent	71	* @param parent
71	* the page container parent	72	* the page container parent
Lines 130-141 Link Here
130		131
131	int activePage = getActivePage();	132	int activePage = getActivePage();
132	if (SharedHeaderFormEditor.this.wasHeaderActive != wasHeaderActive && activePage != -1 && pages.get(activePage) instanceof IEditorPart) {	133	if (SharedHeaderFormEditor.this.wasHeaderActive != wasHeaderActive && activePage != -1 && pages.get(activePage) instanceof IEditorPart) {
133	// TODO [rh] enabled as soon as 3.4 Workbench code is in place	134
134	// if (wasHeaderActive) {	135	if (wasHeaderActive) {
135	// deactivateSite(true, true);	136	deactivateSite(true, true);
136	// } else {	137	} else {
137	// activateSite();	138	activateSite();
138	// }	139	}
139	}	140	}
140		141
141	SharedHeaderFormEditor.this.wasHeaderActive = wasHeaderActive;	142	SharedHeaderFormEditor.this.wasHeaderActive = wasHeaderActive;

Lines 1-5 Link Here

(-)src/org/eclipse/ui/internal/forms/MessageManager.java (-10 / +114 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2007 IBM Corporation and others.	2	* Copyright (c) 2007, 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 7-12 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Benjamin Cabe (benjamin.cabe@anyware-tech.com) - patch (see Bugzilla #255466)
10	******************************************************************************/	11	******************************************************************************/
11		12
12	package org.eclipse.ui.internal.forms;	13	package org.eclipse.ui.internal.forms;
Lines 17-22 Link Here
17	import java.util.Enumeration;	18	import java.util.Enumeration;
18	import java.util.Hashtable;	19	import java.util.Hashtable;
19	import java.util.Iterator;	20	import java.util.Iterator;
		21	import java.util.Map.Entry;
20		22
21	import org.eclipse.jface.dialogs.IMessageProvider;	23	import org.eclipse.jface.dialogs.IMessageProvider;
22	import org.eclipse.jface.fieldassist.ControlDecoration;	24	import org.eclipse.jface.fieldassist.ControlDecoration;
Lines 30-35 Link Here
30	import org.eclipse.ui.forms.IMessage;	32	import org.eclipse.ui.forms.IMessage;
31	import org.eclipse.ui.forms.IMessageManager;	33	import org.eclipse.ui.forms.IMessageManager;
32	import org.eclipse.ui.forms.IMessagePrefixProvider;	34	import org.eclipse.ui.forms.IMessagePrefixProvider;
		35	import org.eclipse.ui.forms.widgets.Form;
33	import org.eclipse.ui.forms.widgets.Hyperlink;	36	import org.eclipse.ui.forms.widgets.Hyperlink;
34	import org.eclipse.ui.forms.widgets.ScrolledForm;	37	import org.eclipse.ui.forms.widgets.ScrolledForm;
35		38
Lines 40-48 Link Here
40	public class MessageManager implements IMessageManager {	43	public class MessageManager implements IMessageManager {
41	private static final DefaultPrefixProvider DEFAULT_PREFIX_PROVIDER = new DefaultPrefixProvider();	44	private static final DefaultPrefixProvider DEFAULT_PREFIX_PROVIDER = new DefaultPrefixProvider();
42	private ArrayList messages = new ArrayList();	45	private ArrayList messages = new ArrayList();
		46	private ArrayList oldMessages;
43	private Hashtable decorators = new Hashtable();	47	private Hashtable decorators = new Hashtable();
		48	private Hashtable oldDecorators;
44	private boolean autoUpdate = true;	49	private boolean autoUpdate = true;
45	private ScrolledForm scrolledForm;	50	private Form form;
46	private IMessagePrefixProvider prefixProvider = DEFAULT_PREFIX_PROVIDER;	51	private IMessagePrefixProvider prefixProvider = DEFAULT_PREFIX_PROVIDER;
47	private int decorationPosition = SWT.LEFT \| SWT.BOTTOM;	52	private int decorationPosition = SWT.LEFT \| SWT.BOTTOM;
48	private static FieldDecoration standardError = FieldDecorationRegistry	53	private static FieldDecoration standardError = FieldDecorationRegistry
Lines 78-83 Link Here
78	this.type = type;	83	this.type = type;
79	this.data = data;	84	this.data = data;
80	}	85	}
		86
		87	private Message(Message message) {
		88	this.key = message.key;
		89	this.message = message.message;
		90	this.type = message.type;
		91	this.data = message.data;
		92	this.prefix = message.prefix;
		93	this.control = message.control;
		94	}
81		95
82	/*	96	/*
83	* (non-Javadoc)	97	* (non-Javadoc)
Lines 132-137 Link Here
132	public String getPrefix() {	146	public String getPrefix() {
133	return prefix;	147	return prefix;
134	}	148	}
		149
		150	public boolean equals(Object obj) {
		151	if (!(obj instanceof Message))
		152	return false;
		153	Message msg = (Message) obj;
		154	return (msg.getPrefix() == null ? getPrefix() == null : msg.getPrefix().equals(getPrefix())) &&
		155	(msg.getControl() == null ? getControl() == null : msg.getControl().equals(getControl())) &&
		156	(msg.getMessageType() == getMessageType()) &&
		157	(msg.getMessage() == null ? getMessage() == null : msg.getMessage().equals(getMessage())) &&
		158	msg.getKey().equals(getKey());
		159	}
135	}	160	}
136		161
137	static class DefaultPrefixProvider implements IMessagePrefixProvider {	162	static class DefaultPrefixProvider implements IMessagePrefixProvider {
Lines 172-178 Link Here
172	private String prefix;	197	private String prefix;
173		198
174	ControlDecorator(Control control) {	199	ControlDecorator(Control control) {
175	this.decoration = new ControlDecoration(control, decorationPosition, scrolledForm.getBody());	200	this.decoration = new ControlDecoration(control, decorationPosition, form.getBody());
		201	}
		202
		203	private ControlDecorator (ControlDecorator cd) {
		204	this.decoration = cd.decoration;
		205	this.prefix = cd.prefix;
		206	for (Iterator i = cd.controlMessages.iterator(); i.hasNext();)
		207	this.controlMessages.add(new Message((Message)i.next()));
176	}	208	}
177		209
178	public boolean isDisposed() {	210	public boolean isDisposed() {
Lines 186-192 Link Here
186	void updatePosition() {	218	void updatePosition() {
187	Control control = decoration.getControl();	219	Control control = decoration.getControl();
188	decoration.dispose();	220	decoration.dispose();
189	this.decoration = new ControlDecoration(control, decorationPosition, scrolledForm.getBody());	221	this.decoration = new ControlDecoration(control, decorationPosition, form.getBody());
190	update();	222	update();
191	}	223	}
192		224
Lines 256-261 Link Here
256	decoration.show();	288	decoration.show();
257	}	289	}
258	}	290	}
		291
		292	public boolean equals(Object obj) {
		293	if (!(obj instanceof ControlDecorator))
		294	return false;
		295	ControlDecorator cd = (ControlDecorator) obj;
		296	if (!cd.decoration.equals(decoration))
		297	return false;
		298	return cd.getPrefix().equals(getPrefix());
		299	}
		300
		301	boolean hasSameMessages(ControlDecorator cd) {
		302	if (cd.controlMessages.size() != controlMessages.size())
		303	return false;
		304	if (!cd.controlMessages.containsAll(controlMessages))
		305	return false;
		306	return true;
		307	}
259	}	308	}
260		309
261	/**	310	/**
Lines 266-272 Link Here
266	* the form to control	315	* the form to control
267	*/	316	*/
268	public MessageManager(ScrolledForm scrolledForm) {	317	public MessageManager(ScrolledForm scrolledForm) {
269	this.scrolledForm = scrolledForm;	318	this.form = scrolledForm.getForm();
		319	}
		320
		321	/**
		322	* Creates a new instance of the message manager that will work with the
		323	* provided form.
		324	*
		325	* @param form
		326	* the form to control
		327	*/
		328	public MessageManager(Form form) {
		329	this.form = form;
270	}	330	}
271		331
272	/*	332	/*
Lines 440-447 Link Here
440		500
441	private void update(ArrayList mergedList) {	501	private void update(ArrayList mergedList) {
442	pruneControlDecorators();	502	pruneControlDecorators();
443	if (mergedList.isEmpty() \|\| mergedList == null) {	503	if (form.getHead().getBounds().height == 0 \|\| mergedList.isEmpty() \|\| mergedList == null) {
444	scrolledForm.setMessage(null, IMessageProvider.NONE);	504	form.setMessage(null, IMessageProvider.NONE);
445	return;	505	return;
446	}	506	}
447	ArrayList peers = createPeers(mergedList);	507	ArrayList peers = createPeers(mergedList);
Lines 453-459 Link Here
453	// a single message	513	// a single message
454	IMessage message = (IMessage) peers.get(0);	514	IMessage message = (IMessage) peers.get(0);
455	messageText = message.getMessage();	515	messageText = message.getMessage();
456	scrolledForm.setMessage(messageText, maxType, array);	516	form.setMessage(messageText, maxType, array);
457	} else {	517	} else {
458	// show a summary message for the message	518	// show a summary message for the message
459	// and list of errors for the details	519	// and list of errors for the details
Lines 463-469 Link Here
463	new String[] { peers.size() + "" }); //$NON-NLS-1$	523	new String[] { peers.size() + "" }); //$NON-NLS-1$
464	else	524	else
465	messageText = SINGLE_MESSAGE_SUMMARY_KEYS[maxType];	525	messageText = SINGLE_MESSAGE_SUMMARY_KEYS[maxType];
466	scrolledForm.setMessage(messageText, maxType, array);	526	form.setMessage(messageText, maxType, array);
467	}	527	}
468	}	528	}
469		529
Lines 593-601 Link Here
593	* @see org.eclipse.ui.forms.IMessageManager#setAutoUpdate(boolean)	653	* @see org.eclipse.ui.forms.IMessageManager#setAutoUpdate(boolean)
594	*/	654	*/
595	public void setAutoUpdate(boolean autoUpdate) {	655	public void setAutoUpdate(boolean autoUpdate) {
		656	boolean needsCaching = this.autoUpdate && !autoUpdate;
596	boolean needsUpdate = !this.autoUpdate && autoUpdate;	657	boolean needsUpdate = !this.autoUpdate && autoUpdate;
597	this.autoUpdate = autoUpdate;	658	this.autoUpdate = autoUpdate;
598	if (needsUpdate)	659	if (needsUpdate && isCacheChanged())
599	update();	660	update();
		661	if (needsCaching) {
		662	oldMessages = new ArrayList();
		663	for (Iterator i = messages.iterator(); i.hasNext();)
		664	oldMessages.add(new Message((Message)i.next()));
		665	oldDecorators = new Hashtable();
		666	for (Enumeration e = decorators.keys(); e.hasMoreElements();) {
		667	Object key = e.nextElement();
		668	oldDecorators.put(key, new ControlDecorator((ControlDecorator)decorators.get(key)));
		669	}
		670	}
		671	}
		672
		673	private boolean isCacheChanged() {
		674	boolean result = false;
		675	result = checkMessageCache() \|\| checkDecoratorCache();
		676	oldMessages.clear();
		677	oldMessages = null;
		678	oldDecorators.clear();
		679	oldDecorators = null;
		680	return result;
		681	}
		682
		683	private boolean checkMessageCache() {
		684	if (oldMessages == null)
		685	return false;
		686	if (messages.size() != oldMessages.size())
		687	return true;
		688	if (!oldMessages.containsAll(messages))
		689	return true;
		690	return false;
		691	}
		692
		693	private boolean checkDecoratorCache() {
		694	if (oldDecorators == null)
		695	return false;
		696	for (Iterator i = decorators.entrySet().iterator(); i.hasNext();) {
		697	Entry next = (Entry)i.next();
		698	ControlDecorator cd = (ControlDecorator)next.getValue();
		699	ControlDecorator oldCd = (ControlDecorator) oldDecorators.get(cd.decoration.getControl());
		700	if ((oldCd == null && cd.controlMessages.size() > 0) \|\| (oldCd != null && !cd.hasSameMessages(oldCd)))
		701	return true;
		702	}
		703	return false;
600	}	704	}
601	}	705	}

Added Link Here

(-)src/org/eclipse/ui/internal/forms/FormsPlugin.java (+30 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 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.ui.internal.forms;
12
13	import org.eclipse.ui.internal.forms.widgets.FormsResources;
14	import org.eclipse.ui.plugin.AbstractUIPlugin;
15	import org.osgi.framework.BundleContext;
16
17	public class FormsPlugin extends AbstractUIPlugin {
18
19	public FormsPlugin() {
20	}
21
22	public void stop(BundleContext context) throws Exception {
23	try {
24	FormsResources.shutdown();
25	} finally {
26	super.stop(context);
27	}
28	}
29
30	}