Attachment 78474 Details for Bug 203451 – Updated patch

[patch] Updated patch

BZ203451_pde_spy_help_patch.txt (text/plain), 4.01 KB, created by Brian Fitzpatrick

on 2007-09-14 16:50:49 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Fitzpatrick

Created: 2007-09-14 16:50:49 EDT

Size: 4.01 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.runtime
>Index: src/org/eclipse/pde/internal/runtime/spy/sections/ActiveHelpSection.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/sections/ActiveHelpSection.java,v
>retrieving revision 1.5
>diff -u -r1.5 ActiveHelpSection.java
>--- src/org/eclipse/pde/internal/runtime/spy/sections/ActiveHelpSection.java	14 Sep 2007 19:13:47 -0000	1.5
>+++ src/org/eclipse/pde/internal/runtime/spy/sections/ActiveHelpSection.java	14 Sep 2007 20:46:46 -0000
>@@ -44,13 +44,14 @@
> 		
> 		StringBuffer helpBuffer = new StringBuffer();
> 		// process help
>-		helpBuffer.append(processControlHelp(event, toolkit));
> 		if(object instanceof IDialogPage) {
> 			IDialogPage page = (IDialogPage) object;
> 			processChildren(page.getControl().getShell(), toolkit, helpBuffer);
> 		} else if(object instanceof Dialog) {
> 			Dialog dialog = (Dialog) object;
> 			processChildren(dialog.getShell(), toolkit, helpBuffer);
>+		} else {
>+			helpBuffer.append(processControlHelp(event, toolkit));
> 		}
> 		
> 		// ensure we actually have help
>@@ -78,7 +79,7 @@
> 
> 	private void processChildren(Control control, SpyFormToolkit toolkit, StringBuffer buffer) {
> 		if(control.getData(HELP_KEY) != null) {
>-			buffer.append("<li bindent=\"20\">" + control.getData(HELP_KEY) + "</li>"); //$NON-NLS-1$ //$NON-NLS-2$
>+			buffer.append("<li bindent=\"20\">" + control.toString() + " - " + control.getData(HELP_KEY) + "</li>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
> 		}
> 		if(control instanceof Composite) {
> 			Composite composite = (Composite) control;
>@@ -136,7 +137,7 @@
> 		if (shell != null) {
> 			buffer.append("<p>Help IDs:</p>"); //$NON-NLS-1$
> 			if (shell.getData(HELP_KEY) != null) { 
>-				buffer.append("<li bindent=\"20\">" + shell.getData(HELP_KEY) + "</li>"); //$NON-NLS-1$ //$NON-NLS-2$
>+				buffer.append("<li bindent=\"20\">" + shell.toString() + " - " + shell.getData(HELP_KEY) + "</li>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
> 			}
> 			for (int i = 0; i < shell.getChildren().length; i++) {
> 				processChildren(shell.getChildren()[i], toolkit, buffer);
>@@ -145,7 +146,7 @@
> 		else if(control != null) {
> 			if(control.getData(HELP_KEY) != null) { 
> 				buffer.append("<p>Help Data:</p>"); //$NON-NLS-1$
>-				buffer.append("<li bindent=\"20\">" + shell.getData(HELP_KEY) + "</li>"); //$NON-NLS-1$ //$NON-NLS-2$
>+				buffer.append("<li bindent=\"20\">" + control.toString() + " - " + control.getData(HELP_KEY) + "</li>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
> 			}
> 			if(control instanceof Composite) {
> 				Composite parent = (Composite) control;
>Index: src/org/eclipse/pde/internal/runtime/spy/dialogs/SpyDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/spy/dialogs/SpyDialog.java,v
>retrieving revision 1.7
>diff -u -r1.7 SpyDialog.java
>--- src/org/eclipse/pde/internal/runtime/spy/dialogs/SpyDialog.java	14 Sep 2007 16:19:24 -0000	1.7
>+++ src/org/eclipse/pde/internal/runtime/spy/dialogs/SpyDialog.java	14 Sep 2007 20:46:46 -0000
>@@ -15,6 +15,7 @@
> import org.eclipse.pde.internal.runtime.PDERuntimeMessages;
> import org.eclipse.pde.internal.runtime.PDERuntimePluginImages;
> import org.eclipse.pde.internal.runtime.spy.SpyFormToolkit;
>+import org.eclipse.pde.internal.runtime.spy.sections.ActiveHelpSection;
> import org.eclipse.pde.internal.runtime.spy.sections.ActivePartSection;
> import org.eclipse.pde.internal.runtime.spy.sections.ActivePreferenceDialogSection;
> import org.eclipse.pde.internal.runtime.spy.sections.ActiveSelectionSection;
>@@ -85,8 +86,8 @@
> 		section = new ActivePreferenceDialogSection();
> 		section.build(form, toolkit, event);
> 		
>-//		section = new ActiveHelpSection();
>-//		section.build(form, toolkit, event);
>+		section = new ActiveHelpSection();
>+		section.build(form, toolkit, event);
> 
> 		parent.pack();
> 		return composite;

Actions: View | Diff

Attachments on bug 203451: 78446 | 78474 | 80076 | 80077 | 80409 | 81632 | 81633 | 81634