Attachment 70714 Details for Bug 191745 – Patch adding context help

[patch] Patch adding context help

patch.txt (text/plain), 7.53 KB, created by Javier Montalvo Orús

on 2007-06-08 13:08:46 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Javier Montalvo Orús

Created: 2007-06-08 13:08:46 EDT

Size: 7.53 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tm.discovery.wizard
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF,v
>retrieving revision 1.11
>diff -u -r1.11 MANIFEST.MF
>--- META-INF/MANIFEST.MF	5 Jun 2007 19:37:32 -0000	1.11
>+++ META-INF/MANIFEST.MF	8 Jun 2007 17:07:19 -0000
>@@ -1,7 +1,7 @@
> Manifest-Version: 1.0
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
>-Bundle-SymbolicName: org.eclipse.tm.discovery.wizard
>+Bundle-SymbolicName: org.eclipse.tm.discovery.wizard;singleton:=true
> Bundle-Version: 2.0.0.qualifier
> Bundle-Activator: org.eclipse.tm.internal.discovery.wizard.Activator
> Bundle-Localization: plugin
>Index: src/org/eclipse/tm/internal/discovery/wizard/ServiceDiscoveryWizardMainPage.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/ServiceDiscoveryWizardMainPage.java,v
>retrieving revision 1.4
>diff -u -r1.4 ServiceDiscoveryWizardMainPage.java
>--- src/org/eclipse/tm/internal/discovery/wizard/ServiceDiscoveryWizardMainPage.java	11 May 2007 10:48:42 -0000	1.4
>+++ src/org/eclipse/tm/internal/discovery/wizard/ServiceDiscoveryWizardMainPage.java	8 Jun 2007 17:07:19 -0000
>@@ -26,6 +26,7 @@
> import org.eclipse.swt.widgets.Text;
> import org.eclipse.tm.discovery.protocol.ProtocolFactory;
> import org.eclipse.tm.discovery.transport.TransportFactory;
>+import org.eclipse.ui.PlatformUI;
> 
> /**
>  * Main wizard page for the service discovery process.</br>
>@@ -104,7 +105,7 @@
> 		});
> 		
> 		addressText.setLayoutData(data);
>-		
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(addressText,"org.eclipse.tm.discovery.wizard.address"); //$NON-NLS-1$
> 		
> 		Composite comp2 = new Composite(comp,SWT.NULL);
> 		GridLayout layout2 = new GridLayout();
>@@ -180,6 +181,7 @@
> 		});
> 		
> 		transportCombo.setLayoutData(data);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(transportCombo,"org.eclipse.tm.discovery.wizard.transport"); //$NON-NLS-1$
> 		
> 		new Label(comp,SWT.NULL).setText(Messages.getString("ServiceDiscoveryWizardMainPage.ProtocolLabel")); //$NON-NLS-1$
> 		
>@@ -221,6 +223,7 @@
> 		});
> 		
> 		protocolCombo.setLayoutData(data);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(protocolCombo,"org.eclipse.tm.discovery.wizard.protocol"); //$NON-NLS-1$
> 		
> 		new Label(comp,SWT.NULL).setText(Messages.getString("ServiceDiscoveryWizardMainPage.DiscoveryQueryLabel")); //$NON-NLS-1$
> 		
>@@ -235,6 +238,7 @@
> 		queryCombo.select(0);
> 		
> 		queryCombo.setLayoutData(data);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(queryCombo,"org.eclipse.tm.discovery.wizard.query"); //$NON-NLS-1$
> 		
> 		new Label(comp,SWT.NULL).setText(Messages.getString("ServiceDiscoveryWizardMainPage.TimeOutLabel")); //$NON-NLS-1$
> 		
>@@ -243,11 +247,15 @@
> 		timeOutText.redraw();
> 		
> 		timeOutText.setLayoutData(data);
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(timeOutText,"org.eclipse.tm.discovery.wizard.timeout"); //$NON-NLS-1$
> 		
> 		setPageComplete(false);
> 		
> 		setControl(comp);
> 		
>+		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(),	"org.eclipse.tm.discovery.wizard.general"); //$NON-NLS-1$
>+		
>+		
> 	}
> 	
> 	/**
>Index: plugin.xml
>===================================================================
>RCS file: plugin.xml
>diff -N plugin.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ plugin.xml	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,22 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<?eclipse version="3.2"?>
>+
>+
>+<plugin>
>+
>+    <extension point="org.eclipse.help.contexts">
>+  		<contexts file="HelpContexts.xml"/>
>+	</extension>
>+    
>+</plugin>
>+
>+
>+
>Index: HelpContexts.xml
>===================================================================
>RCS file: HelpContexts.xml
>diff -N HelpContexts.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ HelpContexts.xml	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,39 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<?NLS TYPE="org.eclipse.help.contexts"?>
>+
>+<contexts>
>+  <context id="general">
>+    <description> Service Discovery allows detecting remote servers using different protocol and transports.</description>
>+    <topic href="HelpContexts.html" label="Service Discovery Wizard"/>
>+  </context>
>+	
>+  <context id="address">
>+    <description>The address can be a multicast address or a multicast address can be suggested by checking the "multicast" checkbox.</description>
>+  </context>
>+
>+  <context id="transport">
>+    <description>Transport to be used to query the remote device.</description>
>+  </context>
>+
>+  <context id="protocol">
>+    <description>Discovery protocol to be used to query the remote device.</description>
>+  </context>
>+
>+  <context id="query">
>+    <description>Message to be sent to the remote device to start the discovery process. It can be empty in some protocols.</description>
>+  </context>
>+
>+  <context id="timeout">
>+    <description>Maximum amount of time (in ms) between replies before ending the discovery session.</description>
>+  </context>
>+	
>+</contexts>
>Index: HelpContexts.html
>===================================================================
>RCS file: HelpContexts.html
>diff -N HelpContexts.html
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ HelpContexts.html	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,38 @@
>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
>+<html>
>+<head>
>+<meta name="copyright" content="Copyright (c) Symbian Software Ltd 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
>+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
>+<meta http-equiv="Content-Style-Type" content="text/css">
>+<title>Service Discovery Wizard</title>
>+</head>
>+<body>
>+<h1>Service Discovery Wizard</h1>
>+
>+<p>
>+<h3>Address</h3>
>+Address of the device to be queried. 
>+The address can be a multicast address or a multicast address can be suggested by checking the "multicast" checkbox.
>+</p>
>+<p>
>+<h3>Transport</h3>
>+Transport to be used to query the remote device.
>+</p>
>+<p>
>+<h3>Protocol</h3>
>+Discovery protocol to be used to query the remote device.
>+</p>
>+<p>
>+<h3>Discovery Query</h3>
>+Message to be sent to the remote device to start the discovery process. It can be empty in some protocols.
>+</p>
>+<p>
>+<h3>Timeout</h3>
>+Maximum amount of time (in ms) between replies before ending the discovery session.
>+</p>
>+<br/> 
>+
>+When clicking the <strong>"Next"</strong> button, the discovery process will start, and the discovered services and their attributes will be shown in a tree.
>+
>+</body>
>+</html>

Flags:

mober.at+eclipse: iplog-

Actions: View | Diff

Attachments on bug 191745: 70714