170935 - [EclipseCon] 2007 PDE example plug-in:  Eclipse Links View
diff --git a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/META-INF/MANIFEST.MF b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/META-INF/MANIFEST.MF
index f3f6bca..d2db2bf 100644
--- a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/META-INF/MANIFEST.MF
+++ b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundle.name
 Bundle-SymbolicName: org.eclipsecon.browser;singleton:=true
-Bundle-Version: 1.2.0
+Bundle-Version: 1.2.1
 Bundle-Activator: org.eclipsecon.browser.view.BrowserPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/icons/sample.gif b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/icons/eclipse_icon.gif
similarity index 100%
rename from presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/icons/sample.gif
rename to presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/icons/eclipse_icon.gif
Binary files differ
diff --git a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/plugin.xml b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/plugin.xml
index 5d4f7c9..fb4128a 100644
--- a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/plugin.xml
+++ b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/plugin.xml
@@ -13,7 +13,7 @@
             allowMultiple="false"
             category="org.eclipsecon.browser.category"
             class="org.eclipsecon.browser.view.ui.EclipseLinksView"
-            icon="icons/sample.gif"
+            icon="icons/eclipse_icon.gif"
             id="org.eclipsecon.browser.view"
             name="%view.name.links">
       </view>
diff --git a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipsecon/browser/view/ui/EclipseLinksView.java b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipsecon/browser/view/ui/EclipseLinksView.java
index 7136a6e..68f1e9c 100644
--- a/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipsecon/browser/view/ui/EclipseLinksView.java
+++ b/presentations/eclipse-con/2007/plugins/org.eclipsecon.browser/src/org/eclipsecon/browser/view/ui/EclipseLinksView.java
@@ -16,18 +16,16 @@
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.forms.FormColors;
 import org.eclipse.ui.forms.HyperlinkGroup;
 import org.eclipse.ui.forms.ManagedForm;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
+import org.eclipse.ui.forms.widgets.Form;
 import org.eclipse.ui.forms.widgets.FormText;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
@@ -68,8 +66,6 @@
 	private EclipseLinkModel fModel;
 
 	private FormText fEclipseImageFormText;	
-	
-	private Label fViewLabel;
 
 	private Composite fBaseComposite;
 	
@@ -145,8 +141,6 @@
 	private void createUIBody() {
 		ScrolledForm form = createUIScrolledForm(fSashForm, 0, 0, GridData.FILL_BOTH);
 		fManagedForm = new ManagedForm(fToolkit, form);
-		// TODO: MP: LINKEX: Use form title rather than label
-		//form.setText("Eclipse Links");
 		//
 		createUISectionProjectLinks(form.getBody());
 		//
@@ -161,9 +155,8 @@
 	 * 
 	 */
 	private void createUIHeader() {
-		Composite parent = createUIComposite(fSashForm, 10, 5, GridData.FILL_HORIZONTAL);		
-		//
-		createUILabelViewTitle(parent);	
+		Form form = createUIForm(fSashForm, 0, 0, GridData.FILL_BOTH);
+		form.setText(BrowserMessages.EclipseLinksView_titleEclipseLinks);
 	}
 
 	/**
@@ -281,14 +274,19 @@
 	}
 
 	/**
-	 * 
+	 * @param parent
 	 */
-	private void createUILabelViewTitle(Composite parent) {
-		fViewLabel = fToolkit.createLabel(parent, BrowserMessages.EclipseLinksView_titleEclipseLinks);
-		// Post 3.3 M4:  Use IFormColors.TITLE
-		fViewLabel.setForeground(fToolkit.getColors().getColor(FormColors.TITLE));
-		fViewLabel.setFont(JFaceResources.getHeaderFont());
-	}
+	private Form createUIForm(Composite parent,
+			int marginWidth, int marginHeight, int style) {
+		Form form = fToolkit.createForm(parent);
+		GridLayout layout = new GridLayout();
+		layout.marginWidth = marginWidth;
+		layout.marginHeight = marginHeight;		
+		form.getBody().setLayout(layout);
+		GridData data = new GridData(style);		
+		form.getBody().setLayoutData(data);	
+		return form;
+	}	
 	
 	/**
 	 *