Attachment 75333 Details for Bug 178557 – patch for problem 1

[patch] patch for problem 1

patch178557.txt (text/plain), 2.78 KB, created by Adam Archer

on 2007-08-03 10:08:43 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Archer

Created: 2007-08-03 10:08:43 EDT

Size: 2.78 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.forms
>Index: src/org/eclipse/ui/forms/widgets/Section.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.forms/src/org/eclipse/ui/forms/widgets/Section.java,v
>retrieving revision 1.43
>diff -u -r1.43 Section.java
>--- src/org/eclipse/ui/forms/widgets/Section.java	16 Mar 2007 20:24:01 -0000	1.43
>+++ src/org/eclipse/ui/forms/widgets/Section.java	3 Aug 2007 13:49:22 -0000
>@@ -26,7 +26,6 @@
> import org.eclipse.swt.widgets.Control;
> import org.eclipse.swt.widgets.Event;
> import org.eclipse.swt.widgets.Listener;
>-import org.eclipse.swt.widgets.Text;
> import org.eclipse.ui.internal.forms.widgets.FormUtil;
> 
> /**
>@@ -83,7 +82,7 @@
> 		super(parent, cstyle | getBackgroundStyle(style), style);
> 		int rtl = cstyle & SWT.RIGHT_TO_LEFT;
> 		if ((style & DESCRIPTION) != 0) {
>-			descriptionControl = new Text(this, SWT.READ_ONLY | SWT.WRAP | rtl);
>+			descriptionControl = new FormText(this, SWT.WRAP | rtl);
> 		}
> 		if ((style & TITLE_BAR) != 0) {
> 			Listener listener = new Listener() {
>@@ -151,8 +150,9 @@
> 	 * @param description
> 	 */
> 	public void setDescription(String description) {
>-		if (descriptionControl instanceof Text)
>-			((Text) descriptionControl).setText(description);
>+		if (descriptionControl instanceof FormText)
>+			((FormText) descriptionControl).setText(description, false, false);
>+		System.out.println(getDescription());
> 	}
> 
> 	/**
>@@ -162,8 +162,8 @@
> 	 *         not used to create the control.
> 	 */
> 	public String getDescription() {
>-		if (descriptionControl instanceof Text)
>-			return ((Text) descriptionControl).getText();
>+		if (descriptionControl instanceof FormText)
>+			return ((FormText) descriptionControl).getAccessibleText();
> 		return null;
> 	}
> 
>Index: src/org/eclipse/ui/forms/widgets/FormText.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.forms/src/org/eclipse/ui/forms/widgets/FormText.java,v
>retrieving revision 1.77
>diff -u -r1.77 FormText.java
>--- src/org/eclipse/ui/forms/widgets/FormText.java	9 May 2007 17:00:14 -0000	1.77
>+++ src/org/eclipse/ui/forms/widgets/FormText.java	3 Aug 2007 13:49:22 -0000
>@@ -1471,7 +1471,9 @@
> 						break;
> 					valid = setControlFocus(advance, selectable);
> 				}
>-				if (selectable != null)
>+				if (selectable == null)
>+					setFocusToNextSibling(this, true);
>+				else
> 					ensureVisible(selectable);
> 				if (selectable instanceof IHyperlinkSegment) {
> 					enterLink((IHyperlinkSegment) selectable, SWT.NULL);
>@@ -1709,4 +1711,8 @@
> 		FormUtil.setFocusScrollingEnabled(this, true);
> 		return result;
> 	}
>+	
>+	protected String getAccessibleText() {
>+		return model.getAccessibleText().trim();
>+	}
> }

Actions: View | Diff

Attachments on bug 178557: 61551 | 61554 | 61555 | 75333 | 76164