Attachment 134819 Details for Bug 261107 – Fixed a few problems with displaying context help

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fixed a few problems with displaying context help

261107 - Update Dali docs for 2.2 release.txt (text/plain), 129.05 KB, created by Tran Le

on 2009-05-07 13:17:27 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tran Le

Created: 2009-05-07 13:17:27 EDT

Size: 129.05 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jpt.eclipselink.ui
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/PersistenceXmlOptionsTab.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/PersistenceXmlOptionsTab.java,v
>retrieving revision 1.1
>diff -u -r1.1 PersistenceXmlOptionsTab.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/PersistenceXmlOptionsTab.java	3 Nov 2008 17:41:34 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/PersistenceXmlOptionsTab.java	7 May 2009 17:06:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2007, 2009 Oracle. 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.
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.options;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.Options;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.WidgetFactory;
> import org.eclipse.jpt.ui.details.JpaPageComposite;
>@@ -43,8 +44,9 @@
> 	}
> 
> 	// ********** JpaPageComposite implementation **********
>+
> 	public String getHelpID() {
>-		return null;
>+		return EclipseLinkHelpContextIds.PERSISTENCE_OPTIONS;
> 	}
> 
> 	public Image getPageImage() {
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/TemporalMutableComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/TemporalMutableComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 TemporalMutableComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/TemporalMutableComposite.java	3 Nov 2008 17:41:34 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/TemporalMutableComposite.java	7 May 2009 17:06:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>-* Copyright (c) 2008 Oracle. All rights reserved.
>+* Copyright (c) 2008, 2009 Oracle. 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.
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.options;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.Options;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
>@@ -89,8 +90,7 @@
> 			EclipseLinkUiMessages.PersistenceXmlOptionsTab_temporalMutableLabel,
> 			this.buildTemporalMutableHolder(),
> 			this.buildTemporalMutableStringHolder(),
>-			null
>-//			EclipseLinkHelpContextIds.OPTIONS_
>+			EclipseLinkHelpContextIds.PERSISTENCE_OPTIONS
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/SessionNameComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/SessionNameComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 SessionNameComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/SessionNameComposite.java	3 Nov 2008 17:41:34 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/SessionNameComposite.java	7 May 2009 17:06:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>-* Copyright (c) 2008 Oracle. All rights reserved.
>+* Copyright (c) 2008, 2009 Oracle. 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.
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.options;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.Options;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.util.SWTUtil;
> import org.eclipse.jpt.ui.internal.widgets.Pane;
>@@ -103,7 +104,7 @@
> 			EclipseLinkUiMessages.PersistenceXmlOptionsTab_sessionName,
> 			this.buildDefaultSessionNameListHolder(),
> 			this.buildSessionNameHolder(),
>-			null		// EclipseLinkHelpContextIds.
>+			EclipseLinkHelpContextIds.PERSISTENCE_OPTIONS_SESSION_NAME
> 		);
> 		SWTUtil.attachDefaultValueHandler(combo);
> 	}
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/TargetDatabaseComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/TargetDatabaseComposite.java,v
>retrieving revision 1.2
>diff -u -r1.2 TargetDatabaseComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/TargetDatabaseComposite.java	5 May 2009 20:44:07 -0000	1.2
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/TargetDatabaseComposite.java	7 May 2009 17:06:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2008, 2009 Oracle. 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.
>@@ -15,6 +15,7 @@
> import java.util.Iterator;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.Options;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.TargetDatabase;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.util.SWTUtil;
> import org.eclipse.jpt.ui.internal.widgets.Pane;
>@@ -178,7 +179,7 @@
> 			this.buildTargetDatabaseListHolder(),
> 			this.buildTargetDatabaseHolder(),
> 			this.buildTargetDatabaseConverter(),
>-			null		// EclipseLinkHelpContextIds.TARGET_DATABASE_NAME
>+			EclipseLinkHelpContextIds.PERSISTENCE_OPTIONS_TARGET_DATABASE
> 		);
> 
> 		SWTUtil.attachDefaultValueHandler(combo);
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/SessionsXmlComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/SessionsXmlComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 SessionsXmlComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/SessionsXmlComposite.java	3 Nov 2008 17:41:34 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/SessionsXmlComposite.java	7 May 2009 17:06:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>-* Copyright (c) 2008 Oracle. All rights reserved.
>+* Copyright (c) 2008, 2009 Oracle. 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.
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.options;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.Options;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.util.SWTUtil;
> import org.eclipse.jpt.ui.internal.widgets.Pane;
>@@ -103,7 +104,7 @@
> 			EclipseLinkUiMessages.PersistenceXmlOptionsTab_sessionsXml,
> 			this.buildDefaultSessionsXmlFileNameListHolder(),
> 			this.buildSessionsXmlFileNameHolder(),
>-			null		// EclipseLinkHelpContextIds.
>+			EclipseLinkHelpContextIds.PERSISTENCE_OPTIONS_SESSIONS_XML
> 		);
> 		SWTUtil.attachDefaultValueHandler(combo);
> 	}
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/IncludeDescriptorQueriesComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/IncludeDescriptorQueriesComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 IncludeDescriptorQueriesComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/IncludeDescriptorQueriesComposite.java	3 Nov 2008 17:41:34 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/IncludeDescriptorQueriesComposite.java	7 May 2009 17:06:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2008, 2009 Oracle. 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.
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.options;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.Options;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
>@@ -89,8 +90,7 @@
> 			EclipseLinkUiMessages.PersistenceXmlOptionsTab_includeDescriptorQueriesLabel,
> 			this.buildIncludeDescriptorQueriesHolder(),
> 			this.buildIncludeDescriptorQueriesStringHolder(),
>-			null
>-//			EclipseLinkHelpContextIds.
>+			EclipseLinkHelpContextIds.PERSISTENCE_OPTIONS
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/TargetServerComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/TargetServerComposite.java,v
>retrieving revision 1.2
>diff -u -r1.2 TargetServerComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/TargetServerComposite.java	5 May 2009 20:44:07 -0000	1.2
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/options/TargetServerComposite.java	7 May 2009 17:06:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>-* Copyright (c) 2008 Oracle. All rights reserved.
>+* Copyright (c) 2008, 2009 Oracle. 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.
>@@ -15,6 +15,7 @@
> import java.util.Iterator;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.Options;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.TargetServer;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.util.SWTUtil;
> import org.eclipse.jpt.ui.internal.widgets.Pane;
>@@ -178,7 +179,7 @@
> 			this.buildTargetServerListHolder(),
> 			this.buildTargetServerHolder(),
> 			this.buildTargetServerConverter(),
>-			null		// EclipseLinkHelpContextIds.TARGET_SERVER_NAME
>+			EclipseLinkHelpContextIds.PERSISTENCE_OPTIONS_TARGET_SERVER
> 		);
> 
> 		SWTUtil.attachDefaultValueHandler(combo);
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java,v
>retrieving revision 1.4
>diff -u -r1.4 EclipseLinkPersistenceUnitMappingFilesComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java	5 Feb 2009 15:46:22 -0000	1.4
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java	7 May 2009 17:06:05 -0000
>@@ -13,6 +13,7 @@
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnit;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.general.GeneralProperties;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.jpt.ui.internal.persistence.details.PersistenceUnitMappingFilesComposite;
> import org.eclipse.jpt.ui.internal.widgets.Pane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
>@@ -56,13 +57,13 @@
> 
> 	@Override
> 	protected void initializeLayout(Composite container) {
>-		addMappingFilesList(container);
>-		addTriStateCheckBoxWithDefault(
>+		this.addMappingFilesList(container);
>+		this.addTriStateCheckBoxWithDefault(
> 			container,
> 			EclipseLinkUiMessages.PersistenceXmlGeneralTab_excludeEclipselinkOrm,
> 			this.buildExcludeEclipselinkOrmHolder(),
> 			this.buildExcludeEclipselinkOrmStringHolder(),
>-			null
>+			JpaHelpContextIds.PERSISTENCE_XML_GENERAL
> 		);
> 
> 	}
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/DefaultCacheTypeComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/DefaultCacheTypeComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 DefaultCacheTypeComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/DefaultCacheTypeComposite.java	3 Nov 2008 17:41:35 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/DefaultCacheTypeComposite.java	7 May 2009 17:06:05 -0000
>@@ -12,6 +12,7 @@
> import java.util.Collection;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.CacheType;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
>@@ -84,7 +85,7 @@
> 			container,
> 			EclipseLinkUiMessages.PersistenceXmlCachingTab_defaultCacheTypeLabel,
> 			this.buildDefaultCacheTypeCombo( container),
>-			null		// TODO IJpaHelpContextIds.
>+			EclipseLinkHelpContextIds.PERSISTENCE_CACHING_DEFAULT_TYPE	
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/CacheSizeComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/CacheSizeComposite.java,v
>retrieving revision 1.2
>diff -u -r1.2 CacheSizeComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/CacheSizeComposite.java	17 Apr 2009 18:30:04 -0000	1.2
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/CacheSizeComposite.java	7 May 2009 17:06:05 -0000
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.caching;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.IntegerCombo;
> import org.eclipse.jpt.ui.internal.widgets.Pane;
>@@ -53,7 +54,7 @@
> 		
> 			@Override
> 			protected String getHelpId() {
>-				return null;
>+				return EclipseLinkHelpContextIds.PERSISTENCE_CACHING;
> 			}
> 			
> 			@Override
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/EntityListComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/EntityListComposite.java,v
>retrieving revision 1.3
>diff -u -r1.3 EntityListComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/EntityListComposite.java	28 Apr 2009 18:01:08 -0000	1.3
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/EntityListComposite.java	7 May 2009 17:06:05 -0000
>@@ -27,6 +27,7 @@
> import org.eclipse.jpt.core.context.Entity;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;
> import org.eclipse.jpt.eclipselink.ui.JptEclipseLinkUiPlugin;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.util.PaneEnabler;
> import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;
>@@ -71,7 +72,7 @@
> 			this.buildEntityCachingListHolder(),
> 			entityHolder,
> 			this.buildEntityLabelProvider(),
>-			null			//		EclipseLinkHelpContextIds.CACHING_ENTITIES
>+			EclipseLinkHelpContextIds.PERSISTENCE_CACHING
> 		);
> 
> 		// Entity Caching property pane
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/DefaultCacheSizeComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/DefaultCacheSizeComposite.java,v
>retrieving revision 1.2
>diff -u -r1.2 DefaultCacheSizeComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/DefaultCacheSizeComposite.java	17 Apr 2009 18:30:04 -0000	1.2
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/DefaultCacheSizeComposite.java	7 May 2009 17:06:05 -0000
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.caching;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.IntegerCombo;
> import org.eclipse.jpt.ui.internal.widgets.Pane;
>@@ -54,7 +55,7 @@
> 		
> 			@Override
> 			protected String getHelpId() {
>-				return null;
>+				return EclipseLinkHelpContextIds.PERSISTENCE_CACHING_DEFAULT_SIZE;
> 			}
> 
> 			@Override
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/PersistenceXmlCachingTab.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/PersistenceXmlCachingTab.java,v
>retrieving revision 1.1
>diff -u -r1.1 PersistenceXmlCachingTab.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/PersistenceXmlCachingTab.java	3 Nov 2008 17:41:35 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/PersistenceXmlCachingTab.java	7 May 2009 17:06:05 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>-* Copyright (c) 2007, 2008 Oracle. All rights reserved.
>+* Copyright (c) 2007, 2009 Oracle. 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.
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.caching;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.WidgetFactory;
> import org.eclipse.jpt.ui.details.JpaPageComposite;
>@@ -43,9 +44,9 @@
> 	}
> 
> 	// ********** JpaPageComposite implementation **********
>-	
>+
> 	public String getHelpID() {
>-		return null;
>+		return EclipseLinkHelpContextIds.PERSISTENCE_CACHING;
> 	}
> 
> 	public Image getPageImage() {
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/DefaultSharedCacheComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/DefaultSharedCacheComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 DefaultSharedCacheComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/DefaultSharedCacheComposite.java	3 Nov 2008 17:41:35 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/DefaultSharedCacheComposite.java	7 May 2009 17:06:05 -0000
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.caching;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
>@@ -89,8 +90,7 @@
> 			EclipseLinkUiMessages.PersistenceXmlCachingTab_sharedCacheDefaultLabel,
> 			this.buildDefaultSharedCacheHolder(),
> 			this.buildDefaultSharedCacheStringHolder(),
>-			null
>-//			EclipseLinkHelpContextIds.CACHING_SHARED_CACHE_DEFAULT
>+			EclipseLinkHelpContextIds.PERSISTENCE_CACHING_DEFAULT_SHARED
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/FlushClearCacheComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/FlushClearCacheComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 FlushClearCacheComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/FlushClearCacheComposite.java	23 Dec 2008 19:40:54 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/FlushClearCacheComposite.java	7 May 2009 17:06:05 -0000
>@@ -13,6 +13,7 @@
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.FlushClearCache;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
>@@ -84,7 +85,7 @@
> 				container,
> 				EclipseLinkUiMessages.PersistenceXmlCachingTab_FlushClearCacheLabel,
> 				this.addFlushClearCacheCombo(container),
>-				null // TODO IJpaHelpContextIds.
>+				EclipseLinkHelpContextIds.PERSISTENCE_CACHING
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/CacheTypeComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/CacheTypeComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 CacheTypeComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/CacheTypeComposite.java	3 Nov 2008 17:41:35 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/CacheTypeComposite.java	7 May 2009 17:06:05 -0000
>@@ -12,6 +12,7 @@
> import java.util.Collection;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.CacheType;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.listeners.SWTPropertyChangeListenerWrapper;
> import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
>@@ -49,7 +50,7 @@
> 			container,
> 			EclipseLinkUiMessages.PersistenceXmlCachingTab_cacheTypeLabel,
> 			new CacheTypeCombo(container),
>-			null		// TODO IJpaHelpContextIds.
>+			EclipseLinkHelpContextIds.PERSISTENCE_CACHING
> 		);
> 	}
> 
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/SharedCacheComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/SharedCacheComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 SharedCacheComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/SharedCacheComposite.java	3 Nov 2008 17:41:35 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/SharedCacheComposite.java	7 May 2009 17:06:05 -0000
>@@ -11,6 +11,7 @@
> 
> import java.util.ArrayList;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.Pane;
> import org.eclipse.jpt.ui.internal.widgets.TriStateCheckBox;
>@@ -147,8 +148,7 @@
> 			EclipseLinkUiMessages.PersistenceXmlCachingTab_sharedCacheLabel,
> 			this.buildSharedCacheHolder(),
> 			this.buildSharedCacheStringHolder(),
>-			null
>-//			EclipseLinkHelpContextIds.CACHING_SHARED_CACHE
>+			EclipseLinkHelpContextIds.PERSISTENCE_CACHING
> 		);
> 	}
> }
>\ No newline at end of file
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/LoggingLevelComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/LoggingLevelComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 LoggingLevelComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/LoggingLevelComposite.java	3 Nov 2008 17:41:33 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/LoggingLevelComposite.java	7 May 2009 17:06:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2008, 2009 Oracle. 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.
>@@ -12,6 +12,7 @@
> import java.util.Collection;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.Logging;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.LoggingLevel;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
>@@ -83,7 +84,7 @@
> 				container,
> 				EclipseLinkUiMessages.PersistenceXmlLoggingTab_loggingLevelLabel,
> 				this.addLoggingLevelCombo(container),
>-				null // TODO IJpaHelpContextIds.
>+				EclipseLinkHelpContextIds.PERSISTENCE_LOGGING_LEVEL
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/ExceptionsComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/ExceptionsComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 ExceptionsComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/ExceptionsComposite.java	3 Nov 2008 17:41:33 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/ExceptionsComposite.java	7 May 2009 17:06:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2008, 2009 Oracle. 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.
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.logging;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.Logging;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
>@@ -89,8 +90,7 @@
> 			EclipseLinkUiMessages.PersistenceXmlLoggingTab_exceptionsLabel,
> 			this.buildExceptionsHolder(),
> 			this.buildExceptionsStringHolder(),
>-			null
>-//			EclipseLinkHelpContextIds.LOGGING_
>+			EclipseLinkHelpContextIds.PERSISTENCE_LOGGING_EXCEPTIONS
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/PersistenceXmlLoggingTab.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/PersistenceXmlLoggingTab.java,v
>retrieving revision 1.1
>diff -u -r1.1 PersistenceXmlLoggingTab.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/PersistenceXmlLoggingTab.java	3 Nov 2008 17:41:33 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/PersistenceXmlLoggingTab.java	7 May 2009 17:06:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2007, 2009 Oracle. 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.
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.logging;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.Logging;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.WidgetFactory;
> import org.eclipse.jpt.ui.details.JpaPageComposite;
>@@ -43,8 +44,9 @@
> 	}
> 
> 	// ********** JpaPageComposite implementation **********
>+
> 	public String getHelpID() {
>-		return null;
>+		return EclipseLinkHelpContextIds.PERSISTENCE_LOGGING;
> 	}
> 
> 	public Image getPageImage() {
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/SessionComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/SessionComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 SessionComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/SessionComposite.java	3 Nov 2008 17:41:33 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/SessionComposite.java	7 May 2009 17:06:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2008, 2009 Oracle. 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.
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.logging;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.Logging;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
>@@ -89,8 +90,7 @@
> 			EclipseLinkUiMessages.PersistenceXmlLoggingTab_sessionLabel,
> 			this.buildSessionHolder(),
> 			this.buildSessionStringHolder(),
>-			null
>-//			EclipseLinkHelpContextIds.LOGGING_
>+			EclipseLinkHelpContextIds.PERSISTENCE_LOGGING_SESSION
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/ThreadComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/ThreadComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 ThreadComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/ThreadComposite.java	3 Nov 2008 17:41:33 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/ThreadComposite.java	7 May 2009 17:06:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2008, 2009 Oracle. 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.
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.logging;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.Logging;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
>@@ -89,8 +90,7 @@
> 			EclipseLinkUiMessages.PersistenceXmlLoggingTab_threadLabel,
> 			this.buildThreadHolder(),
> 			this.buildThreadStringHolder(),
>-			null
>-//			EclipseLinkHelpContextIds.LOGGING_
>+			EclipseLinkHelpContextIds.PERSISTENCE_LOGGING_THREAD
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/TimestampComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/TimestampComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 TimestampComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/TimestampComposite.java	3 Nov 2008 17:41:33 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/logging/TimestampComposite.java	7 May 2009 17:06:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2008, 2009 Oracle. 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.
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.logging;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.Logging;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
>@@ -89,8 +90,7 @@
> 			EclipseLinkUiMessages.PersistenceXmlLoggingTab_timestampLabel,
> 			this.buildTimestampHolder(),
> 			this.buildTimestampStringHolder(),
>-			null
>-//			EclipseLinkHelpContextIds.LOGGING_
>+			EclipseLinkHelpContextIds.PERSISTENCE_LOGGING_TIMESTAMP
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcWriteConnectionsMinComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcWriteConnectionsMinComposite.java,v
>retrieving revision 1.2
>diff -u -r1.2 JdbcWriteConnectionsMinComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcWriteConnectionsMinComposite.java	17 Apr 2009 18:30:04 -0000	1.2
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcWriteConnectionsMinComposite.java	7 May 2009 17:06:05 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2008, 2008 Oracle. 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.
>@@ -11,6 +11,7 @@
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.jpt.ui.internal.widgets.IntegerCombo;
> import org.eclipse.jpt.ui.internal.widgets.Pane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
>@@ -52,7 +53,7 @@
> 		
> 			@Override
> 			protected String getHelpId() {
>-				return null;
>+				return JpaHelpContextIds.PERSISTENCE_XML_CONNECTION;
> 			}
> 			
> 			@Override
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcReadConnectionsMaxComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcReadConnectionsMaxComposite.java,v
>retrieving revision 1.2
>diff -u -r1.2 JdbcReadConnectionsMaxComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcReadConnectionsMaxComposite.java	17 Apr 2009 18:30:04 -0000	1.2
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcReadConnectionsMaxComposite.java	7 May 2009 17:06:05 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2008, 2009 Oracle. 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.
>@@ -11,6 +11,7 @@
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.jpt.ui.internal.widgets.IntegerCombo;
> import org.eclipse.jpt.ui.internal.widgets.Pane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
>@@ -53,7 +54,7 @@
> 		
> 			@Override
> 			protected String getHelpId() {
>-				return null;
>+				return JpaHelpContextIds.PERSISTENCE_XML_CONNECTION;
> 			}
> 			
> 			@Override
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcReadConnectionsMinComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcReadConnectionsMinComposite.java,v
>retrieving revision 1.2
>diff -u -r1.2 JdbcReadConnectionsMinComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcReadConnectionsMinComposite.java	17 Apr 2009 18:30:04 -0000	1.2
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcReadConnectionsMinComposite.java	7 May 2009 17:06:05 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2008, 2009 Oracle. 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.
>@@ -11,6 +11,7 @@
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.jpt.ui.internal.widgets.IntegerCombo;
> import org.eclipse.jpt.ui.internal.widgets.Pane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
>@@ -52,7 +53,7 @@
> 		
> 			@Override
> 			protected String getHelpId() {
>-				return null;
>+				return JpaHelpContextIds.PERSISTENCE_XML_CONNECTION;
> 			}
> 			
> 			@Override
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/PersistenceXmlConnectionTab.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/PersistenceXmlConnectionTab.java,v
>retrieving revision 1.1
>diff -u -r1.1 PersistenceXmlConnectionTab.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/PersistenceXmlConnectionTab.java	3 Nov 2008 17:41:35 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/PersistenceXmlConnectionTab.java	7 May 2009 17:06:05 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2007, 2009 Oracle. 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.
>@@ -13,6 +13,7 @@
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.WidgetFactory;
> import org.eclipse.jpt.ui.details.JpaPageComposite;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
> import org.eclipse.jpt.utility.model.value.PropertyValueModel;
> import org.eclipse.swt.SWT;
>@@ -43,8 +44,9 @@
> 	}
> 
> 	// ********** JpaPageComposite implementation **********
>+
> 	public String getHelpID() {
>-		return null;
>+		return JpaHelpContextIds.PERSISTENCE_XML_CONNECTION;
> 	}
> 
> 	public Image getPageImage() {
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/NativeSqlComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/NativeSqlComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 NativeSqlComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/NativeSqlComposite.java	3 Nov 2008 17:41:35 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/NativeSqlComposite.java	7 May 2009 17:06:05 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2008, 2009 Oracle. 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.
>@@ -11,6 +11,7 @@
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.jpt.ui.internal.widgets.Pane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
> import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
>@@ -89,8 +90,7 @@
> 			EclipseLinkUiMessages.PersistenceXmlConnectionTab_nativeSqlLabel,
> 			this.buildNativeSqlHolder(),
> 			this.buildNativeSqlStringHolder(),
>-			null
>-//			EclipseLinkHelpContextIds.
>+			JpaHelpContextIds.PERSISTENCE_XML_CONNECTION
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcReadConnectionsSharedComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcReadConnectionsSharedComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 JdbcReadConnectionsSharedComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcReadConnectionsSharedComposite.java	3 Nov 2008 17:41:35 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcReadConnectionsSharedComposite.java	7 May 2009 17:06:05 -0000
>@@ -11,6 +11,7 @@
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.jpt.ui.internal.widgets.Pane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
> import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
>@@ -89,8 +90,7 @@
> 			EclipseLinkUiMessages.PersistenceXmlConnectionTab_readConnectionsSharedLabel,
> 			this.buildReadConnectionsSharedHolder(),
> 			this.buildReadConnectionsSharedStringHolder(),
>-			null
>-//			EclipseLinkHelpContextIds.
>+			JpaHelpContextIds.PERSISTENCE_XML_CONNECTION
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcWriteConnectionsMaxComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcWriteConnectionsMaxComposite.java,v
>retrieving revision 1.2
>diff -u -r1.2 JdbcWriteConnectionsMaxComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcWriteConnectionsMaxComposite.java	17 Apr 2009 18:30:04 -0000	1.2
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcWriteConnectionsMaxComposite.java	7 May 2009 17:06:05 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2008, 2009 Oracle. 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.
>@@ -11,6 +11,7 @@
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.jpt.ui.internal.widgets.IntegerCombo;
> import org.eclipse.jpt.ui.internal.widgets.Pane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
>@@ -52,7 +53,7 @@
> 		
> 			@Override
> 			protected String getHelpId() {
>-				return null;
>+				return JpaHelpContextIds.PERSISTENCE_XML_CONNECTION;
> 			}
> 			
> 			@Override
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/CacheStatementsPropertiesComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/CacheStatementsPropertiesComposite.java,v
>retrieving revision 1.2
>diff -u -r1.2 CacheStatementsPropertiesComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/CacheStatementsPropertiesComposite.java	20 Apr 2009 18:56:17 -0000	1.2
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/CacheStatementsPropertiesComposite.java	7 May 2009 17:06:05 -0000
>@@ -11,6 +11,7 @@
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.jpt.ui.internal.util.PaneEnabler;
> import org.eclipse.jpt.ui.internal.widgets.IntegerCombo;
> import org.eclipse.jpt.ui.internal.widgets.Pane;
>@@ -42,7 +43,7 @@
> 			container,
> 			EclipseLinkUiMessages.PersistenceXmlConnectionTab_cacheStatementsLabel,
> 			cacheStatementsHolder,
>-			null
>+			JpaHelpContextIds.PERSISTENCE_XML_CONNECTION
> 		);
> 		IntegerCombo<?> combo = addCacheStatementsSizeCombo(container);
> 
>@@ -94,7 +95,7 @@
> 		
> 			@Override
> 			protected String getHelpId() {
>-				return null;
>+				return JpaHelpContextIds.PERSISTENCE_XML_CONNECTION;
> 			}
> 
> 			@Override
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/TransactionTypeComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/TransactionTypeComposite.java,v
>retrieving revision 1.2
>diff -u -r1.2 TransactionTypeComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/TransactionTypeComposite.java	24 Apr 2009 22:14:48 -0000	1.2
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/TransactionTypeComposite.java	7 May 2009 17:06:05 -0000
>@@ -15,6 +15,7 @@
> import org.eclipse.jpt.core.context.persistence.PersistenceUnitTransactionType;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
>@@ -119,7 +120,7 @@
> 			container,
> 			EclipseLinkUiMessages.PersistenceXmlConnectionTab_transactionTypeLabel,
> 			this.addTransactionTypeCombo( container),
>-			null		// TODO IJpaHelpContextIds.
>+			JpaHelpContextIds.PERSISTENCE_XML_CONNECTION
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcBindParametersComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcBindParametersComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 JdbcBindParametersComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcBindParametersComposite.java	3 Nov 2008 17:41:34 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcBindParametersComposite.java	7 May 2009 17:06:05 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2008, 2009 Oracle. 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.
>@@ -11,6 +11,7 @@
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.jpt.ui.internal.widgets.Pane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
> import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
>@@ -89,8 +90,7 @@
> 			EclipseLinkUiMessages.PersistenceXmlConnectionTab_bindParametersLabel,
> 			this.buildBindParametersHolder(),
> 			this.buildBindParametersStringHolder(),
>-			null
>-//			EclipseLinkHelpContextIds.
>+			JpaHelpContextIds.PERSISTENCE_XML_CONNECTION
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/DataSourcePropertiesComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/DataSourcePropertiesComposite.java,v
>retrieving revision 1.2
>diff -u -r1.2 DataSourcePropertiesComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/DataSourcePropertiesComposite.java	24 Apr 2009 22:14:48 -0000	1.2
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/DataSourcePropertiesComposite.java	7 May 2009 17:06:05 -0000
>@@ -13,6 +13,7 @@
> import org.eclipse.jpt.core.context.persistence.PersistenceUnitTransactionType;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.jpt.ui.internal.util.ControlEnabler;
> import org.eclipse.jpt.ui.internal.widgets.Pane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
>@@ -124,15 +125,15 @@
> 
> 		// JTA Data Source
> 		Label jtaLabel = addUnmanagedLabel(container, EclipseLinkUiMessages.PersistenceXmlConnectionTab_jtaDataSourceLabel);
>-		Text text = addUnmanagedText(container, buildJtaDataSourceHolder(), null);
>-		this.addLabeledComposite(container, jtaLabel, text, null);
>+		Text text = addUnmanagedText(container, this.buildJtaDataSourceHolder(), this.getHelpID());
>+		this.addLabeledComposite(container, jtaLabel, text, this.getHelpID());
> 
> 		this.installJTADataSourceControlEnabler(text, jtaLabel);
> 
> 		// Non-JTA Data Source
> 		Label nonJtaLabel = addUnmanagedLabel(container, EclipseLinkUiMessages.PersistenceXmlConnectionTab_nonJtaDataSourceLabel);
>-		Text nonJtaText = addUnmanagedText(container, buildNonJtaDataSourceHolder(), null);
>-		this.addLabeledComposite(container, nonJtaLabel, nonJtaText, null);
>+		Text nonJtaText = addUnmanagedText(container, buildNonJtaDataSourceHolder(), this.getHelpID());
>+		this.addLabeledComposite(container, nonJtaLabel, nonJtaText, this.getHelpID());
> 
> 		this.installNonJTADataSourceControlEnabler(nonJtaText, nonJtaLabel);
> 	}
>@@ -144,4 +145,8 @@
> 	private void installNonJTADataSourceControlEnabler(Text text, Label label) {
> 		new ControlEnabler(buildNonJTADataSourceHolder(), text, label);
> 	}
>+	
>+	public String getHelpID() {
>+		return JpaHelpContextIds.PERSISTENCE_XML_CONNECTION;
>+	}
> }
>\ No newline at end of file
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/BatchWritingComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/BatchWritingComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 BatchWritingComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/BatchWritingComposite.java	3 Nov 2008 17:41:35 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/BatchWritingComposite.java	7 May 2009 17:06:05 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2008, 2009 Oracle. 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.
>@@ -10,9 +10,11 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.connection;
> 
> import java.util.Collection;
>+
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.BatchWriting;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
> import org.eclipse.swt.widgets.Composite;
>@@ -79,7 +81,7 @@
> 			container,
> 			EclipseLinkUiMessages.PersistenceXmlConnectionTab_batchWritingLabel,
> 			this.addBatchWritingCombo( container),
>-			null		// TODO IJpaHelpContextIds.
>+			JpaHelpContextIds.PERSISTENCE_XML_CONNECTION
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/schema/generation/CreateDdlFileNameComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/schema/generation/CreateDdlFileNameComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 CreateDdlFileNameComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/schema/generation/CreateDdlFileNameComposite.java	3 Nov 2008 17:41:35 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/schema/generation/CreateDdlFileNameComposite.java	7 May 2009 17:06:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>-* Copyright (c) 2008 Oracle. All rights reserved.
>+* Copyright (c) 2008, 2009 Oracle. 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.
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.schema.generation;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.SchemaGeneration;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.util.SWTUtil;
> import org.eclipse.jpt.ui.internal.widgets.Pane;
>@@ -103,7 +104,7 @@
> 			EclipseLinkUiMessages.PersistenceXmlSchemaGenerationTab_createDdlFileNameLabel,
> 			this.buildDefaultCreateDdlFileNameListHolder(),
> 			this.buildCreateDdlFileNameHolder(),
>-			null		// EclipseLinkHelpContextIds.CREATE_DDL_FILE_NAME
>+			EclipseLinkHelpContextIds.PERSISTENCE_SCHEMA_GENERATION
> 		);
> 		SWTUtil.attachDefaultValueHandler(combo);
> 	}
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/schema/generation/DdlGenerationTypeComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/schema/generation/DdlGenerationTypeComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 DdlGenerationTypeComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/schema/generation/DdlGenerationTypeComposite.java	3 Nov 2008 17:41:35 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/schema/generation/DdlGenerationTypeComposite.java	7 May 2009 17:06:06 -0000
>@@ -12,6 +12,7 @@
> import java.util.Collection;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.DdlGenerationType;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.SchemaGeneration;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
>@@ -80,7 +81,7 @@
> 			container,
> 			EclipseLinkUiMessages.PersistenceXmlSchemaGenerationTab_ddlGenerationTypeLabel,
> 			addDdlGenerationTypeCombo( container),
>-			null		// TODO IJpaHelpContextIds.
>+			EclipseLinkHelpContextIds.PERSISTENCE_SCHEMA_GENERATION
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/schema/generation/DropDdlFileNameComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/schema/generation/DropDdlFileNameComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 DropDdlFileNameComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/schema/generation/DropDdlFileNameComposite.java	3 Nov 2008 17:41:35 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/schema/generation/DropDdlFileNameComposite.java	7 May 2009 17:06:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>-* Copyright (c) 2008 Oracle. All rights reserved.
>+* Copyright (c) 2008, 2009 Oracle. 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.
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.schema.generation;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.SchemaGeneration;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.util.SWTUtil;
> import org.eclipse.jpt.ui.internal.widgets.Pane;
>@@ -103,7 +104,7 @@
> 			EclipseLinkUiMessages.PersistenceXmlSchemaGenerationTab_dropDdlFileNameLabel,
> 			this.buildDefaultDropDdlFileNameListHolder(),
> 			this.buildDropDdlFileNameHolder(),
>-			null		// EclipseLinkHelpContextIds.DROP_DDL_FILE_NAME
>+			EclipseLinkHelpContextIds.PERSISTENCE_SCHEMA_GENERATION
> 		);
> 		SWTUtil.attachDefaultValueHandler(combo);
> 	}
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/schema/generation/OutputModeComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/schema/generation/OutputModeComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 OutputModeComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/schema/generation/OutputModeComposite.java	3 Nov 2008 17:41:35 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/schema/generation/OutputModeComposite.java	7 May 2009 17:06:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2008, 2009 Oracle. 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.
>@@ -12,6 +12,7 @@
> import java.util.Collection;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.OutputMode;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.SchemaGeneration;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
>@@ -78,7 +79,7 @@
> 				container,
> 				EclipseLinkUiMessages.PersistenceXmlSchemaGenerationTab_outputModeLabel,
> 				this.addBuildOutputModeCombo(container),
>-				null // TODO IJpaHelpContextIds.
>+				EclipseLinkHelpContextIds.PERSISTENCE_SCHEMA_GENERATION
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/schema/generation/PersistenceXmlSchemaGenerationTab.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/schema/generation/PersistenceXmlSchemaGenerationTab.java,v
>retrieving revision 1.1
>diff -u -r1.1 PersistenceXmlSchemaGenerationTab.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/schema/generation/PersistenceXmlSchemaGenerationTab.java	3 Nov 2008 17:41:35 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/schema/generation/PersistenceXmlSchemaGenerationTab.java	7 May 2009 17:06:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2007, 2009 Oracle. 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.
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.schema.generation;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.SchemaGeneration;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.WidgetFactory;
> import org.eclipse.jpt.ui.details.JpaPageComposite;
>@@ -40,8 +41,9 @@
> 	}
> 
> 	// ********** JpaPageComposite implementation **********
>+
> 	public String getHelpID() {
>-		return null;
>+		return EclipseLinkHelpContextIds.PERSISTENCE_SCHEMA_GENERATION;
> 	}
> 
> 	public Image getPageImage() {
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingFetchGroupsComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingFetchGroupsComposite.java,v
>retrieving revision 1.2
>diff -u -r1.2 WeavingFetchGroupsComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingFetchGroupsComposite.java	24 Apr 2009 21:58:50 -0000	1.2
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingFetchGroupsComposite.java	7 May 2009 17:06:05 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2008, 2009 Oracle. 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.
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.customization;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
>@@ -89,8 +90,7 @@
> 			EclipseLinkUiMessages.PersistenceXmlCustomizationTab_weavingFetchGroupsLabel,
> 			this.buildWeavingFetchGroupsHolder(),
> 			this.buildWeavingFetchGroupsStringHolder(),
>-			null
>-//			EclipseLinkHelpContextIds.CUSTOMIZATION_WEAVING_FETCH_GROUPS
>+			EclipseLinkHelpContextIds.PERSISTENCE_CUSTOMIZATION
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingLazyComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingLazyComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 WeavingLazyComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingLazyComposite.java	3 Nov 2008 17:41:34 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingLazyComposite.java	7 May 2009 17:06:05 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2008, 2009 Oracle. 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.
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.customization;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
>@@ -89,8 +90,7 @@
> 			EclipseLinkUiMessages.PersistenceXmlCustomizationTab_weavingLazyLabel,
> 			this.buildWeavingLazyHolder(),
> 			this.buildWeavingLazyStringHolder(),
>-			null
>-//			EclipseLinkHelpContextIds.CUSTOMIZATION_WEAVING_LAZY
>+			EclipseLinkHelpContextIds.PERSISTENCE_CUSTOMIZATION
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingEagerComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingEagerComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 WeavingEagerComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingEagerComposite.java	10 Nov 2008 16:34:48 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingEagerComposite.java	7 May 2009 17:06:05 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2008, 2009 Oracle. 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.
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.customization;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
>@@ -89,8 +90,7 @@
> 			EclipseLinkUiMessages.PersistenceXmlCustomizationTab_weavingEagerLabel,
> 			this.buildWeavingEagerHolder(),
> 			this.buildWeavingEagerStringHolder(),
>-			null
>-//			EclipseLinkHelpContextIds._
>+			EclipseLinkHelpContextIds.PERSISTENCE_CUSTOMIZATION
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/PersistenceXmlCustomizationTab.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/PersistenceXmlCustomizationTab.java,v
>retrieving revision 1.1
>diff -u -r1.1 PersistenceXmlCustomizationTab.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/PersistenceXmlCustomizationTab.java	3 Nov 2008 17:41:34 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/PersistenceXmlCustomizationTab.java	7 May 2009 17:06:05 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>-* Copyright (c) 2008 Oracle. All rights reserved.
>+* Copyright (c) 2009 Oracle. 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.
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.customization;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.WidgetFactory;
> import org.eclipse.jpt.ui.details.JpaPageComposite;
>@@ -43,14 +44,15 @@
> 	}
> 
> 	// ********** JpaPageComposite implementation **********
>-	
>+
> 	public String getHelpID() {
>-		return null;
>+		return EclipseLinkHelpContextIds.PERSISTENCE_CUSTOMIZATION;
> 	}
> 
> 	public Image getPageImage() {
> 		return null;
> 	}
>+	
> 	public String getPageText() {
> 		return EclipseLinkUiMessages.PersistenceXmlCustomizationTab_title;
> 	}
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/ValidationOnlyComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/ValidationOnlyComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 ValidationOnlyComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/ValidationOnlyComposite.java	23 Dec 2008 19:40:54 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/ValidationOnlyComposite.java	7 May 2009 17:06:05 -0000
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.customization;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
>@@ -89,8 +90,7 @@
> 			EclipseLinkUiMessages.PersistenceXmlCustomizationTab_validationOnlyLabel,
> 			this.buildValidationOnlyHolder(),
> 			this.buildValidationOnlyStringHolder(),
>-			null
>-//			EclipseLinkHelpContextIds.
>+			EclipseLinkHelpContextIds.PERSISTENCE_CUSTOMIZATION
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/EntityListComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/EntityListComposite.java,v
>retrieving revision 1.3
>diff -u -r1.3 EntityListComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/EntityListComposite.java	28 Apr 2009 18:01:08 -0000	1.3
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/EntityListComposite.java	7 May 2009 17:06:05 -0000
>@@ -27,6 +27,7 @@
> import org.eclipse.jpt.core.context.Entity;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;
> import org.eclipse.jpt.eclipselink.ui.JptEclipseLinkUiPlugin;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.util.PaneEnabler;
> import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;
>@@ -79,7 +80,7 @@
> 			this.buildEntityCustomizationListHolder(),
> 			this.entityHolder,
> 			this.buildEntityLabelProvider(),
>-			null			//		EclipseLinkHelpContextIds.CUSTOMIZATION_ENTITIES
>+			EclipseLinkHelpContextIds.PERSISTENCE_CUSTOMIZATION
> 		);
> 
> 		// Entity Customization property pane
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/ThrowExceptionsComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/ThrowExceptionsComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 ThrowExceptionsComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/ThrowExceptionsComposite.java	3 Nov 2008 17:41:34 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/ThrowExceptionsComposite.java	7 May 2009 17:06:05 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2008, 2009 Oracle. 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.
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.customization;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
>@@ -89,8 +90,7 @@
> 			EclipseLinkUiMessages.PersistenceXmlCustomizationTab_throwExceptionsLabel,
> 			this.buildThrowExceptionsHolder(),
> 			this.buildThrowExceptionsStringHolder(),
>-			null
>-//			EclipseLinkHelpContextIds.CUSTOMIZATION_THROW_EXCEPTIONS
>+			EclipseLinkHelpContextIds.PERSISTENCE_CUSTOMIZATION
> 		);
> 	}
> 	
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 WeavingComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingComposite.java	3 Nov 2008 17:41:34 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingComposite.java	7 May 2009 17:06:05 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2008, 2009 Oracle. 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.
>@@ -12,6 +12,7 @@
> import java.util.Collection;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Weaving;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
>@@ -79,7 +80,7 @@
> 			container,
> 			EclipseLinkUiMessages.PersistenceXmlCustomizationTab_weavingLabel,
> 			this.addWeavingCombo( container),
>-			null		// TODO IJpaHelpContextIds.
>+			EclipseLinkHelpContextIds.PERSISTENCE_CUSTOMIZATION
> 		);
> 	}
> 
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingChangeTrackingComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingChangeTrackingComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 WeavingChangeTrackingComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingChangeTrackingComposite.java	3 Nov 2008 17:41:34 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingChangeTrackingComposite.java	7 May 2009 17:06:05 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2008, 2009 Oracle. 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.
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.customization;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
>@@ -89,8 +90,7 @@
> 			EclipseLinkUiMessages.PersistenceXmlCustomizationTab_weavingChangeTrackingLabel,
> 			this.buildWeavingChangeTrackingHolder(),
> 			this.buildWeavingChangeTrackingStringHolder(),
>-			null
>-//			EclipseLinkHelpContextIds.CUSTOMIZATION_WEAVING_CHANGE_TRACKING
>+			EclipseLinkHelpContextIds.PERSISTENCE_CUSTOMIZATION
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingInternalComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingInternalComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 WeavingInternalComposite.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingInternalComposite.java	10 Nov 2008 16:34:48 -0000	1.1
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/WeavingInternalComposite.java	7 May 2009 17:06:05 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2008, 2009 Oracle. 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.
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.eclipselink.ui.internal.persistence.customization;
> 
> import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.Customization;
>+import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
> import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
> import org.eclipse.jpt.ui.internal.widgets.FormPane;
> import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
>@@ -89,8 +90,7 @@
> 			EclipseLinkUiMessages.PersistenceXmlCustomizationTab_weavingInternalLabel,
> 			this.buildWeavingInternalHolder(),
> 			this.buildWeavingInternalStringHolder(),
>-			null
>-//			EclipseLinkHelpContextIds._WEAVING_INTERNAL
>+			EclipseLinkHelpContextIds.PERSISTENCE_CUSTOMIZATION
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/eclipselink/ui/internal/EclipseLinkHelpContextIds.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/EclipseLinkHelpContextIds.java,v
>retrieving revision 1.2
>diff -u -r1.2 EclipseLinkHelpContextIds.java
>--- src/org/eclipse/jpt/eclipselink/ui/internal/EclipseLinkHelpContextIds.java	4 Aug 2008 19:49:08 -0000	1.2
>+++ src/org/eclipse/jpt/eclipselink/ui/internal/EclipseLinkHelpContextIds.java	7 May 2009 17:06:05 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2009 Oracle. 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.
>@@ -9,7 +9,7 @@
>  ******************************************************************************/
> package org.eclipse.jpt.eclipselink.ui.internal;
> 
>-import org.eclipse.jpt.eclipselink.ui.JptEclipseLinkUiPlugin;
>+import org.eclipse.jpt.ui.JptUiPlugin;
> 
> /**
>  * Help context ids for the Dali EclipseLink UI.
>@@ -22,15 +22,36 @@
> public interface EclipseLinkHelpContextIds {
> 
> 	//ContextID prefix
>-	public static final String PREFIX = JptEclipseLinkUiPlugin.PLUGIN_ID + ".";
>+	public static final String PREFIX = JptUiPlugin.PLUGIN_ID + ".";
> 
> 	//Persistent Type composites
>-	public static final String CACHING_CACHE_TYPE = PREFIX + "caching_cacheType";
>-	public static final String CACHING_SHARED = PREFIX + "caching_shared";
> 	public static final String CACHING_ALWAYS_REFRESH = PREFIX + "caching_alwaysRefresh";
>-	public static final String CACHING_REFRESH_ONLY_IF_NEWER = PREFIX + "caching_refreshOnlyIfNewer";
>-	public static final String CACHING_DISABLE_HITS = PREFIX + "caching_disableHits";
> 	public static final String CACHING_CACHE_COORDINATION_TYPE = PREFIX + "caching_cacheCoordinationType";
>+	public static final String CACHING_CACHE_TYPE = PREFIX + "caching_cacheType";
>+	public static final String CACHING_DISABLE_HITS = PREFIX + "caching_disableHits";
>+	public static final String CACHING_REFRESH_ONLY_IF_NEWER = PREFIX + "caching_refreshOnlyIfNewer";
>+	public static final String CACHING_SHARED = PREFIX + "caching_shared";
>+
>+	//Persistence Xml Editor
>+	public static final String PERSISTENCE_CACHING = PREFIX + "persistence_caching";
>+	public static final String PERSISTENCE_CUSTOMIZATION = PREFIX + "persistence_customization";
>+	public static final String PERSISTENCE_LOGGING = PREFIX + "persistence_logging";
>+	public static final String PERSISTENCE_OPTIONS = PREFIX + "persistence_options";
>+	public static final String PERSISTENCE_SCHEMA_GENERATION = PREFIX + "persistence_schemaGeneration";
>+
>+	public static final String PERSISTENCE_CACHING_DEFAULT_SHARED = PREFIX + "caching_defaultShared";
>+	public static final String PERSISTENCE_CACHING_DEFAULT_SIZE = PREFIX + "caching_defaultSize";
>+	public static final String PERSISTENCE_CACHING_DEFAULT_TYPE = PREFIX + "caching_defaultType";
>+	
>+	public static final String PERSISTENCE_LOGGING_EXCEPTIONS = PREFIX + "logging_exceptions";
>+	public static final String PERSISTENCE_LOGGING_LEVEL = PREFIX + "logging_level";
>+	public static final String PERSISTENCE_LOGGING_SESSION = PREFIX + "logging_session";
>+	public static final String PERSISTENCE_LOGGING_THREAD = PREFIX + "logging_thread";
>+	public static final String PERSISTENCE_LOGGING_TIMESTAMP = PREFIX + "logging_timeStamp";
> 	
>-		
>+	public static final String PERSISTENCE_OPTIONS_SESSION_NAME = PREFIX + "options_sessionName";
>+	public static final String PERSISTENCE_OPTIONS_SESSIONS_XML = PREFIX + "options_sessionsXml";
>+	public static final String PERSISTENCE_OPTIONS_TARGET_DATABASE = PREFIX + "options_targetDatabase";
>+	public static final String PERSISTENCE_OPTIONS_TARGET_SERVER = PREFIX + "options_targetServer";
>+
> }
>#P org.eclipse.jpt.ui
>Index: src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitJarFilesComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitJarFilesComposite.java,v
>retrieving revision 1.3
>diff -u -r1.3 PersistenceUnitJarFilesComposite.java
>--- src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitJarFilesComposite.java	22 Apr 2009 19:36:27 -0000	1.3
>+++ src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitJarFilesComposite.java	7 May 2009 17:06:10 -0000
>@@ -22,6 +22,7 @@
> import org.eclipse.jpt.core.context.persistence.JarFileRef;
> import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
> import org.eclipse.jpt.ui.JptUiPlugin;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.jpt.ui.internal.JptUiIcons;
> import org.eclipse.jpt.ui.internal.jface.JarFileViewerFilter;
> import org.eclipse.jpt.ui.internal.persistence.JptUiPersistenceMessages;
>@@ -94,10 +95,11 @@
> 		new AddRemoveListPane<PersistenceUnit>(
> 			this,
> 			container,
>-			buildAdapter(),
>-			buildItemListHolder(),
>-			buildSelectedItemHolder(),
>-			buildLabelProvider()
>+			this.buildAdapter(),
>+			this.buildItemListHolder(),
>+			this.buildSelectedItemHolder(),
>+			this.buildLabelProvider(),
>+			JpaHelpContextIds.PERSISTENCE_XML_GENERAL
> 		) {
> 			@Override
> 			protected Composite addContainer(Composite parent) {
>Index: src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitPropertiesComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitPropertiesComposite.java,v
>retrieving revision 1.8
>diff -u -r1.8 PersistenceUnitPropertiesComposite.java
>--- src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitPropertiesComposite.java	28 Jan 2009 06:18:32 -0000	1.8
>+++ src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitPropertiesComposite.java	7 May 2009 17:06:10 -0000
>@@ -131,7 +131,7 @@
> 	 * {@inheritDoc}
> 	 */
> 	public String getHelpID() {
>-		return JpaHelpContextIds.PERSISTENCE_UNIT_PROPERTIES;
>+		return JpaHelpContextIds.PERSISTENCE_XML_PROPERTIES;
> 	}
> 
> 	/**
>Index: src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitClassesComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitClassesComposite.java,v
>retrieving revision 1.15
>diff -u -r1.15 PersistenceUnitClassesComposite.java
>--- src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitClassesComposite.java	24 Mar 2009 19:56:43 -0000	1.15
>+++ src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitClassesComposite.java	7 May 2009 17:06:09 -0000
>@@ -28,6 +28,7 @@
> import org.eclipse.jpt.core.context.persistence.ClassRef;
> import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
> import org.eclipse.jpt.ui.JptUiPlugin;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.jpt.ui.internal.JpaMappingImageHelper;
> import org.eclipse.jpt.ui.internal.JptUiIcons;
> import org.eclipse.jpt.ui.internal.JptUiMessages;
>@@ -348,10 +349,11 @@
> 		new AddRemoveListPane<PersistenceUnit>(
> 			this,
> 			container,
>-			buildAdapter(),
>-			buildItemListHolder(),
>-			buildSelectedItemHolder(),
>-			buildLabelProvider()
>+			this.buildAdapter(),
>+			this.buildItemListHolder(),
>+			this.buildSelectedItemHolder(),
>+			this.buildLabelProvider(),
>+			JpaHelpContextIds.PERSISTENCE_XML_GENERAL
> 		)
> 		{
> 			@Override
>@@ -364,12 +366,12 @@
> 			}
> 		};
> 
>-		addTriStateCheckBoxWithDefault(
>+		this.addTriStateCheckBoxWithDefault(
> 			container,
> 			JptUiPersistenceMessages.PersistenceUnitClassesComposite_excludeUnlistedMappedClasses,
> 			buildExcludeUnlistedMappedClassesHolder(),
> 			buildExcludeUnlistedMappedClassesStringHolder(),
>-			null
>+			JpaHelpContextIds.PERSISTENCE_XML_GENERAL
> 		);
> 	}
> 
>Index: src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitGeneralComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitGeneralComposite.java,v
>retrieving revision 1.12
>diff -u -r1.12 PersistenceUnitGeneralComposite.java
>--- src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitGeneralComposite.java	22 Apr 2009 19:36:27 -0000	1.12
>+++ src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitGeneralComposite.java	7 May 2009 17:06:10 -0000
>@@ -170,7 +170,7 @@
> 	 * (non-Javadoc)
> 	 */
> 	public String getHelpID() {
>-		return JpaHelpContextIds.PERSISTENCE_UNIT_GENERAL;
>+		return JpaHelpContextIds.PERSISTENCE_XML_GENERAL;
> 	}
> 
> 	/*
>@@ -189,30 +189,33 @@
> 
> 	protected void initializeGeneralPane(Composite container) {
> 
>-		container = addSection(
>+		container = this.addSection(
> 			container,
> 			JptUiPersistenceMessages.PersistenceUnitGeneralComposite_general
> 		);
> 
> 		// Name widgets
>-		addLabeledText(
>+		this.addLabeledText(
> 			container,
> 			JptUiPersistenceMessages.PersistenceUnitGeneralComposite_name,
>-			buildPersistenceUnitNameHolder()
>+			this.buildPersistenceUnitNameHolder(),
>+			this.getHelpID()
> 		);
> 
> 		// Persistence Provider widgets
>-		addLabeledText(
>+		this.addLabeledText(
> 			container,
> 			JptUiPersistenceMessages.PersistenceUnitGeneralComposite_persistenceProvider,
>-			buildPersistenceProviderHolder()
>+			this.buildPersistenceProviderHolder(),
>+			this.getHelpID()
> 		);
> 
> 		// Description widgets
>-		addLabeledText(
>+		this.addLabeledText(
> 			container,
> 			JptUiPersistenceMessages.PersistenceUnitGeneralComposite_description,
>-			buildPersistenceUnitDescriptionHolder()
>+			this.buildPersistenceUnitDescriptionHolder(),
>+			this.getHelpID()
> 		);
> 	}
> 
>Index: src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitConnectionComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitConnectionComposite.java,v
>retrieving revision 1.6
>diff -u -r1.6 PersistenceUnitConnectionComposite.java
>--- src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitConnectionComposite.java	25 Aug 2008 15:33:03 -0000	1.6
>+++ src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitConnectionComposite.java	7 May 2009 17:06:09 -0000
>@@ -91,7 +91,7 @@
> 	 * (non-Javadoc)
> 	 */
> 	public String getHelpID() {
>-		return JpaHelpContextIds.PERSISTENCE_UNIT_CONNECTION;
>+		return JpaHelpContextIds.PERSISTENCE_XML_CONNECTION;
> 	}
> 
> 	private void initializeDatabasePane(Composite container) {
>Index: src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitConnectionGeneralComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitConnectionGeneralComposite.java,v
>retrieving revision 1.5
>diff -u -r1.5 PersistenceUnitConnectionGeneralComposite.java
>--- src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitConnectionGeneralComposite.java	25 Aug 2008 15:33:03 -0000	1.5
>+++ src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitConnectionGeneralComposite.java	7 May 2009 17:06:10 -0000
>@@ -12,6 +12,7 @@
> import java.util.Collection;
> import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
> import org.eclipse.jpt.core.context.persistence.PersistenceUnitTransactionType;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.jpt.ui.internal.persistence.JptUiPersistenceMessages;
> import org.eclipse.jpt.ui.internal.widgets.Pane;
> import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
>@@ -98,7 +99,8 @@
> 		addLabeledComposite(
> 			container,
> 			JptUiPersistenceMessages.PersistenceUnitConnectionGeneralComposite_transactionType,
>-			buildTransactionTypeCombo(container).getControl()
>+			buildTransactionTypeCombo(container).getControl(),
>+			JpaHelpContextIds.PERSISTENCE_XML_CONNECTION
> 		);
> 	}
> }
>Index: src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitConnectionDatabaseComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitConnectionDatabaseComposite.java,v
>retrieving revision 1.4
>diff -u -r1.4 PersistenceUnitConnectionDatabaseComposite.java
>--- src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitConnectionDatabaseComposite.java	25 Aug 2008 15:33:03 -0000	1.4
>+++ src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitConnectionDatabaseComposite.java	7 May 2009 17:06:10 -0000
>@@ -11,6 +11,7 @@
> 
> import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
> import org.eclipse.jpt.core.context.persistence.PersistenceUnitTransactionType;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.jpt.ui.internal.persistence.JptUiPersistenceMessages;
> import org.eclipse.jpt.ui.internal.util.ControlEnabler;
> import org.eclipse.jpt.ui.internal.widgets.Pane;
>@@ -131,10 +132,10 @@
> 			JptUiPersistenceMessages.PersistenceUnitConnectionDatabaseComposite_jtaDatasourceName);
> 		Text text = addUnmanagedText(
> 			container,
>-			buildJTADatasourceNameHolder(), 
>-			null
>+			buildJTADatasourceNameHolder(),
>+			JpaHelpContextIds.PERSISTENCE_XML_CONNECTION
> 		);
>-		addLabeledComposite(container, label, text, null);
>+		addLabeledComposite(container, label, text, JpaHelpContextIds.PERSISTENCE_XML_CONNECTION);
> 		
> 		installJTADatasourceNameEnabler(text, label);
> 		
>@@ -146,9 +147,9 @@
> 		text = addUnmanagedText(
> 			container,
> 			buildNonJTADatasourceNameHolder(),
>-			null
>+			JpaHelpContextIds.PERSISTENCE_XML_CONNECTION
> 		);
>-		addLabeledComposite(container, label, text, null);
>+		addLabeledComposite(container, label, text, JpaHelpContextIds.PERSISTENCE_XML_CONNECTION);
> 
> 		installNonJTADatasourceNameEnabler(text, label);
> 	}
>Index: src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitMappingFilesComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitMappingFilesComposite.java,v
>retrieving revision 1.15
>diff -u -r1.15 PersistenceUnitMappingFilesComposite.java
>--- src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitMappingFilesComposite.java	22 Apr 2009 19:36:27 -0000	1.15
>+++ src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitMappingFilesComposite.java	7 May 2009 17:06:10 -0000
>@@ -27,6 +27,7 @@
> import org.eclipse.jpt.core.context.persistence.MappingFileRef;
> import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
> import org.eclipse.jpt.ui.JptUiPlugin;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.jpt.ui.internal.JptUiIcons;
> import org.eclipse.jpt.ui.internal.jface.XmlMappingFileViewerFilter;
> import org.eclipse.jpt.ui.internal.persistence.JptUiPersistenceMessages;
>@@ -97,7 +98,8 @@
> 			buildAdapter(),
> 			buildItemListHolder(),
> 			buildSelectedItemHolder(),
>-			buildLabelProvider()
>+			buildLabelProvider(),
>+			JpaHelpContextIds.PERSISTENCE_XML_GENERAL
> 		) {
> 			@Override
> 			protected Composite addContainer(Composite parent) {
>Index: src/org/eclipse/jpt/ui/internal/wizards/JpaFacetWizardPage.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/JpaFacetWizardPage.java,v
>retrieving revision 1.31
>diff -u -r1.31 JpaFacetWizardPage.java
>--- src/org/eclipse/jpt/ui/internal/wizards/JpaFacetWizardPage.java	11 Mar 2009 00:21:58 -0000	1.31
>+++ src/org/eclipse/jpt/ui/internal/wizards/JpaFacetWizardPage.java	7 May 2009 17:06:10 -0000
>@@ -34,6 +34,7 @@
> import org.eclipse.swt.widgets.Label;
> import org.eclipse.swt.widgets.Link;
> import org.eclipse.ui.PlatformUI;
>+import org.eclipse.ui.help.IWorkbenchHelpSystem;
> import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
> import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent;
> import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectListener;
>@@ -56,6 +57,7 @@
> 		Composite composite = new Composite(parent, SWT.NULL);
> 		GridLayout layout = new GridLayout();
> 		composite.setLayout(layout);
>+		this.getHelpSystem().setHelp(composite, JpaHelpContextIds.NEW_JPA_PROJECT_JPA_FACET);
> 
> 		new PlatformGroup(composite);
> 		new ClasspathConfigGroup(composite);
>@@ -370,4 +372,8 @@
> 			synchHelper.synchCheckbox(createOrmXmlButton, CREATE_ORM_XML, null);
> 		}
> 	}
>+	
>+	protected final IWorkbenchHelpSystem getHelpSystem() {
>+		return PlatformUI.getWorkbench().getHelpSystem();
>+	}
> }
>Index: src/org/eclipse/jpt/ui/internal/wizards/gen/TablesAndColumnsCustomizationWizardPage.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/TablesAndColumnsCustomizationWizardPage.java,v
>retrieving revision 1.4
>diff -u -r1.4 TablesAndColumnsCustomizationWizardPage.java
>--- src/org/eclipse/jpt/ui/internal/wizards/gen/TablesAndColumnsCustomizationWizardPage.java	14 Apr 2009 14:45:18 -0000	1.4
>+++ src/org/eclipse/jpt/ui/internal/wizards/gen/TablesAndColumnsCustomizationWizardPage.java	7 May 2009 17:06:11 -0000
>@@ -33,6 +33,7 @@
> import org.eclipse.jpt.gen.internal2.ORMGenTable;
> import org.eclipse.jpt.gen.internal2.util.DTPUtil;
> import org.eclipse.jpt.ui.CommonImages;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.custom.StackLayout;
> import org.eclipse.swt.graphics.Image;
>@@ -44,6 +45,7 @@
> import org.eclipse.swt.widgets.Label;
> import org.eclipse.swt.widgets.Text;
> import org.eclipse.ui.PlatformUI;
>+import org.eclipse.ui.help.IWorkbenchHelpSystem;
> 
> public class TablesAndColumnsCustomizationWizardPage extends NewTypeWizardPage {
> 
>@@ -91,7 +93,7 @@
> 		GridLayout layout = new GridLayout();
> 		layout.numColumns = nColumns;
> 		composite.setLayout(layout);
>-		//PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, JpaHelpContextIds.DIALOG_GENERATE_ENTITIES);
>+		this.getHelpSystem().setHelp(composite, JpaHelpContextIds.GENERATE_ENTITIES_WIZARD_CUSTOMIZE_INDIVIDUAL_ENTITIES);
> 
> 		createTableAndColumnsListPanel(composite, 1);
> 		
>@@ -368,6 +370,10 @@
>     @Override
>     public final void performHelp() 
>     {
>-        PlatformUI.getWorkbench().getHelpSystem().displayHelp( GenerateEntitiesFromSchemaWizard.HELP_CONTEXT_ID );
>+        this.getHelpSystem().displayHelp( GenerateEntitiesFromSchemaWizard.HELP_CONTEXT_ID );
>     }
>+
>+	protected final IWorkbenchHelpSystem getHelpSystem() {
>+		return PlatformUI.getWorkbench().getHelpSystem();
>+	}
> }
>Index: src/org/eclipse/jpt/ui/internal/wizards/gen/TablesSelectorWizardPage.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/TablesSelectorWizardPage.java,v
>retrieving revision 1.4
>diff -u -r1.4 TablesSelectorWizardPage.java
>--- src/org/eclipse/jpt/ui/internal/wizards/gen/TablesSelectorWizardPage.java	14 Apr 2009 19:36:48 -0000	1.4
>+++ src/org/eclipse/jpt/ui/internal/wizards/gen/TablesSelectorWizardPage.java	7 May 2009 17:06:11 -0000
>@@ -65,6 +65,7 @@
> import org.eclipse.swt.widgets.TableColumn;
> import org.eclipse.swt.widgets.TableItem;
> import org.eclipse.ui.PlatformUI;
>+import org.eclipse.ui.help.IWorkbenchHelpSystem;
> 
> class TablesSelectorWizardPage extends WizardPage{
> 
>@@ -125,6 +126,7 @@
> 		GridLayout layout = new GridLayout();
> 		layout.numColumns = nColumns;
> 		composite.setLayout(layout);
>+		this.getHelpSystem().setHelp(composite, JpaHelpContextIds.GENERATE_ENTITIES_WIZARD_SELECT_TABLES);
> 
> 		this.databaseGroup = createDatabaseGroup(composite, 400);
> 
>@@ -170,11 +172,11 @@
> 		restoreBtn.setLayoutData(gridData);
> 		
> 		
>-		PlatformUI.getWorkbench().getHelpSystem().setHelp(this.tableTable.getControl(), JpaHelpContextIds.DIALOG_GENERATE_ENTITIES_TABLES);
>+		this.getHelpSystem().setHelp(this.tableTable.getControl(), JpaHelpContextIds.DIALOG_GENERATE_ENTITIES_TABLES);
> 
>-		setControl(composite);
>+		this.setControl(composite);
> 
>-		setPageComplete(true);
>+		this.setPageComplete(true);
> 	}
> 
> 	@Override
>@@ -539,6 +541,10 @@
>     @Override
>     public final void performHelp() 
>     {
>-        PlatformUI.getWorkbench().getHelpSystem().displayHelp( GenerateEntitiesFromSchemaWizard.HELP_CONTEXT_ID );
>+    	this.getHelpSystem().displayHelp( GenerateEntitiesFromSchemaWizard.HELP_CONTEXT_ID );
>     }
>+    
>+	protected final IWorkbenchHelpSystem getHelpSystem() {
>+		return PlatformUI.getWorkbench().getHelpSystem();
>+	}
> }
>Index: src/org/eclipse/jpt/ui/internal/wizards/gen/DefaultTableGenerationWizardPage.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/DefaultTableGenerationWizardPage.java,v
>retrieving revision 1.4
>diff -u -r1.4 DefaultTableGenerationWizardPage.java
>--- src/org/eclipse/jpt/ui/internal/wizards/gen/DefaultTableGenerationWizardPage.java	16 Apr 2009 18:59:24 -0000	1.4
>+++ src/org/eclipse/jpt/ui/internal/wizards/gen/DefaultTableGenerationWizardPage.java	7 May 2009 17:06:10 -0000
>@@ -41,6 +41,7 @@
> import org.eclipse.jpt.gen.internal2.ORMGenCustomizer;
> import org.eclipse.jpt.gen.internal2.ORMGenTable;
> import org.eclipse.jpt.ui.JptUiPlugin;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.layout.GridLayout;
>@@ -48,6 +49,7 @@
> import org.eclipse.swt.widgets.Group;
> import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
>+import org.eclipse.ui.help.IWorkbenchHelpSystem;
> 
> /**
>  * A wizard page allowing the entry of the default table generation 
>@@ -98,7 +100,7 @@
> 		GridLayout layout = new GridLayout();
> 		layout.numColumns = nColumns;
> 		composite.setLayout(layout);
>-		//PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, JpaHelpContextIds.DIALOG_GENERATE_ENTITIES);
>+		this.getHelpSystem().setHelp(composite, JpaHelpContextIds.GENERATE_ENTITIES_WIZARD_CUSTOMIZE_DEFAULT_ENTITY_GENERATION);
> 
> 		//Create entity access, collection type, etc 
> 		defaultTableGenPanel = new TableGenPanel(composite, 4, true, this);
>@@ -320,7 +322,11 @@
> 
>     @Override
>     public final void performHelp() {
>-        PlatformUI.getWorkbench().getHelpSystem().displayHelp( GenerateEntitiesFromSchemaWizard.HELP_CONTEXT_ID );
>+        this.getHelpSystem().displayHelp( GenerateEntitiesFromSchemaWizard.HELP_CONTEXT_ID );
>     }
>+    
>+	protected final IWorkbenchHelpSystem getHelpSystem() {
>+		return PlatformUI.getWorkbench().getHelpSystem();
>+	}
> }
> 
>Index: src/org/eclipse/jpt/ui/internal/wizards/gen/CardinalityPage.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/CardinalityPage.java,v
>retrieving revision 1.2
>diff -u -r1.2 CardinalityPage.java
>--- src/org/eclipse/jpt/ui/internal/wizards/gen/CardinalityPage.java	16 Mar 2009 19:20:38 -0000	1.2
>+++ src/org/eclipse/jpt/ui/internal/wizards/gen/CardinalityPage.java	7 May 2009 17:06:10 -0000
>@@ -12,6 +12,7 @@
> 
> import org.eclipse.jpt.gen.internal2.Association;
> import org.eclipse.jpt.gen.internal2.ORMGenCustomizer;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.SelectionEvent;
> import org.eclipse.swt.events.SelectionListener;
>@@ -45,7 +46,7 @@
> 		GridLayout layout = new GridLayout();
> 		layout.numColumns = nColumns;
> 		composite.setLayout(layout);
>-		//PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, JpaHelpContextIds.DIALOG_GENERATE_ENTITIES);
>+		this.getHelpSystem().setHelp(composite, JpaHelpContextIds.GENERATE_ENTITIES_WIZARD_ASSOCIATION_CARDINALITY);
> 
> 		CardinalitySelectionListener selectionListener = new CardinalitySelectionListener();
> 		cardinalityButtons[0] = createRadioButton( composite, 1, JptUiEntityGenMessages.manyToOne);
>Index: src/org/eclipse/jpt/ui/internal/wizards/gen/TableAssociationsWizardPage.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/TableAssociationsWizardPage.java,v
>retrieving revision 1.2
>diff -u -r1.2 TableAssociationsWizardPage.java
>--- src/org/eclipse/jpt/ui/internal/wizards/gen/TableAssociationsWizardPage.java	16 Mar 2009 19:20:38 -0000	1.2
>+++ src/org/eclipse/jpt/ui/internal/wizards/gen/TableAssociationsWizardPage.java	7 May 2009 17:06:11 -0000
>@@ -36,6 +36,7 @@
> import org.eclipse.jpt.gen.internal2.ORMGenCustomizer;
> import org.eclipse.jpt.gen.internal2.util.DTPUtil;
> import org.eclipse.jpt.ui.CommonImages;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.custom.StackLayout;
> import org.eclipse.swt.events.ModifyEvent;
>@@ -53,6 +54,7 @@
> import org.eclipse.swt.widgets.Label;
> import org.eclipse.swt.widgets.Text;
> import org.eclipse.ui.PlatformUI;
>+import org.eclipse.ui.help.IWorkbenchHelpSystem;
> 
> public class TableAssociationsWizardPage extends WizardPage {
> 
>@@ -108,7 +110,7 @@
> 		GridLayout layout = new GridLayout();
> 		layout.numColumns = nColumns;
> 		composite.setLayout(layout);
>-		//PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, JpaHelpContextIds.DIALOG_GENERATE_ENTITIES);
>+		this.getHelpSystem().setHelp(composite, JpaHelpContextIds.GENERATE_ENTITIES_WIZARD_TABLE_ASSOCIATIONS);
> 
> 		Label label = new Label(composite, SWT.NONE);
> 		label.setText( JptUiEntityGenMessages.GenerateEntitiesWizard_assocPage_label );
>@@ -746,6 +748,10 @@
>     @Override
>     public final void performHelp() 
>     {
>-        PlatformUI.getWorkbench().getHelpSystem().displayHelp( GenerateEntitiesFromSchemaWizard.HELP_CONTEXT_ID );
>+        this.getHelpSystem().displayHelp( GenerateEntitiesFromSchemaWizard.HELP_CONTEXT_ID );
>     }
>+    
>+	protected final IWorkbenchHelpSystem getHelpSystem() {
>+		return PlatformUI.getWorkbench().getHelpSystem();
>+	}
> }
>Index: src/org/eclipse/jpt/ui/internal/wizards/gen/CascadeDialog.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/CascadeDialog.java,v
>retrieving revision 1.2
>diff -u -r1.2 CascadeDialog.java
>--- src/org/eclipse/jpt/ui/internal/wizards/gen/CascadeDialog.java	16 Mar 2009 19:20:38 -0000	1.2
>+++ src/org/eclipse/jpt/ui/internal/wizards/gen/CascadeDialog.java	7 May 2009 17:06:10 -0000
>@@ -18,6 +18,7 @@
> import org.eclipse.jface.dialogs.TrayDialog;
> import org.eclipse.jpt.gen.internal2.AssociationRole;
> import org.eclipse.jpt.gen.internal2.util.StringUtil;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.SelectionEvent;
> import org.eclipse.swt.events.SelectionListener;
>@@ -29,6 +30,8 @@
> import org.eclipse.swt.widgets.Display;
> import org.eclipse.swt.widgets.Group;
> import org.eclipse.swt.widgets.Shell;
>+import org.eclipse.ui.PlatformUI;
>+import org.eclipse.ui.help.IWorkbenchHelpSystem;
> 
> /**
>  * Simple dialog allows user to set the cascade property of an associationRole.
>@@ -69,6 +72,7 @@
>     protected void configureShell(Shell newShell) {
>         super.configureShell(newShell);
>         newShell.setText(JptUiEntityGenMessages.selectCascadeDlgTitle);
>+		this.getHelpSystem().setHelp(newShell, JpaHelpContextIds.GENERATE_ENTITIES_WIZARD_SELECT_CASCADE);
>     }
> 	
> 	private void setAssociationRole(AssociationRole role) {
>@@ -148,6 +152,10 @@
> 		}
> 		return false;
> 	}
>+	
>+	protected final IWorkbenchHelpSystem getHelpSystem() {
>+		return PlatformUI.getWorkbench().getHelpSystem();
>+	}
> 
> }
> 
>Index: src/org/eclipse/jpt/ui/internal/wizards/gen/JoinColumnsPage.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/JoinColumnsPage.java,v
>retrieving revision 1.3
>diff -u -r1.3 JoinColumnsPage.java
>--- src/org/eclipse/jpt/ui/internal/wizards/gen/JoinColumnsPage.java	15 Apr 2009 17:59:46 -0000	1.3
>+++ src/org/eclipse/jpt/ui/internal/wizards/gen/JoinColumnsPage.java	7 May 2009 17:06:10 -0000
>@@ -39,6 +39,7 @@
> import org.eclipse.jpt.db.Table;
> import org.eclipse.jpt.gen.internal2.Association;
> import org.eclipse.jpt.gen.internal2.ORMGenCustomizer;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.jpt.ui.internal.util.SWTUtil;
> import org.eclipse.jpt.ui.internal.util.TableLayoutComposite;
> import org.eclipse.swt.SWT;
>@@ -89,7 +90,8 @@
> 		GridLayout layout = new GridLayout();
> 		layout.numColumns = 1;
> 		composite.setLayout(layout);
>-		
>+		this.getHelpSystem().setHelp(composite, JpaHelpContextIds.GENERATE_ENTITIES_WIZARD_JOIN_COLUMNS);
>+
> 		tablesGroup1 = new Composite(composite, SWT.SHADOW_ETCHED_IN);
> 		tablesGroup1.setLayoutData(new GridData());
> 		tablesGroup1.setLayout(new GridLayout(2, false));
>Index: src/org/eclipse/jpt/ui/internal/wizards/gen/AssociationTablesPage.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/AssociationTablesPage.java,v
>retrieving revision 1.3
>diff -u -r1.3 AssociationTablesPage.java
>--- src/org/eclipse/jpt/ui/internal/wizards/gen/AssociationTablesPage.java	16 Mar 2009 19:20:38 -0000	1.3
>+++ src/org/eclipse/jpt/ui/internal/wizards/gen/AssociationTablesPage.java	7 May 2009 17:06:10 -0000
>@@ -18,6 +18,7 @@
> import org.eclipse.jpt.gen.internal2.Association;
> import org.eclipse.jpt.gen.internal2.ORMGenCustomizer;
> import org.eclipse.jpt.ui.CommonImages;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.SelectionEvent;
> import org.eclipse.swt.events.SelectionListener;
>@@ -57,7 +58,7 @@
> 		layout.numColumns = nColumns;
> 		assocKindGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
> 		assocKindGroup.setLayout(layout);
>-		//PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, JpaHelpContextIds.DIALOG_GENERATE_ENTITIES);
>+		this.getHelpSystem().setHelp(composite, JpaHelpContextIds.GENERATE_ENTITIES_WIZARD_ASSOCIATION_TABLES);
> 		assocKindGroup.setText( JptUiEntityGenMessages.GenerateEntitiesWizard_newAssoc_tablesPage_assocKind);
> 
> 		simpleAssoBtn = createButton(assocKindGroup, 3, JptUiEntityGenMessages.GenerateEntitiesWizard_newAssoc_tablesPage_simpleAssoc, SWT.RADIO);
>Index: src/org/eclipse/jpt/ui/internal/wizards/gen/NewAssociationWizardPage.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/NewAssociationWizardPage.java,v
>retrieving revision 1.2
>diff -u -r1.2 NewAssociationWizardPage.java
>--- src/org/eclipse/jpt/ui/internal/wizards/gen/NewAssociationWizardPage.java	16 Mar 2009 19:20:38 -0000	1.2
>+++ src/org/eclipse/jpt/ui/internal/wizards/gen/NewAssociationWizardPage.java	7 May 2009 17:06:10 -0000
>@@ -14,6 +14,8 @@
> 
> import org.eclipse.jface.wizard.WizardPage;
> import org.eclipse.jpt.gen.internal2.ORMGenCustomizer;
>+import org.eclipse.ui.PlatformUI;
>+import org.eclipse.ui.help.IWorkbenchHelpSystem;
> 
> 
> public abstract class NewAssociationWizardPage extends WizardPage {
>@@ -47,5 +49,12 @@
> 	
> 	public void updateWithNewTables() {
> 	}
>-	
>+
>+	/**
>+	 * Returns the helps system.
>+	 * @return The platform's help system
>+	 */
>+	protected final IWorkbenchHelpSystem getHelpSystem() {
>+		return PlatformUI.getWorkbench().getHelpSystem();
>+	}
> }
>Index: src/org/eclipse/jpt/ui/internal/JpaHelpContextIds.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaHelpContextIds.java,v
>retrieving revision 1.8
>diff -u -r1.8 JpaHelpContextIds.java
>--- src/org/eclipse/jpt/ui/internal/JpaHelpContextIds.java	2 Apr 2009 19:14:27 -0000	1.8
>+++ src/org/eclipse/jpt/ui/internal/JpaHelpContextIds.java	7 May 2009 17:06:09 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
>+ * Copyright (c) 2007, 2009 Oracle. 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.
>@@ -106,17 +106,36 @@
> 	public static final String DIALOG_GENERATE_ENTITIES_TABLES = PREFIX + "dialog_generateEntities_tables";
> 	public static final String DIALOG_JPA_FACET = PREFIX + "dialog_JPAFacet";
> 	public static final String DIALOG_JPA_PLATFORM = PREFIX + "dialog_JPAPlatform";
>+	
>+	//New JPA Project wizard:
> 	public static final String NEW_JPA_PROJECT = PREFIX + "dialog_newJPAProject";
>  	public static final String NEW_JPA_PROJECT_CONTENT_PAGE_CLASSPATH = PREFIX + "dialog_addJavaPersistence_classpath";
>  	public static final String NEW_JPA_PROJECT_CONTENT_PAGE_DATABASE = PREFIX + "dialog_addJavaPersistence_database";
>  	public static final String NEW_JPA_PROJECT_CONTENT_PAGE_PACKAGING = PREFIX + "dialog_addJavaPersistence_packaging";
>  	public static final String NEW_JPA_PROJECT_CREATION_PAGE = PREFIX + "dialog_addJavaPersistence";
>+	public static final String NEW_JPA_PROJECT_JPA_FACET = PREFIX + "dialog_newJPAProjectFacet";
> 
> 	//Other
> 	public static final String PERSISTENCE_OUTLINE = PREFIX + "persistenceOutline";
> 
>-	//PersistenceUnit
>-	public static final String PERSISTENCE_UNIT_CONNECTION = PREFIX + "persistenceUnit_connection";
>-	public static final String PERSISTENCE_UNIT_GENERAL    = PREFIX + "persistenceUnit_general";
>-	public static final String PERSISTENCE_UNIT_PROPERTIES = PREFIX + "persistenceUnit_properties";
>+	//Persistence Xml Editor
>+	public static final String PERSISTENCE_XML_CONNECTION = PREFIX + "persistence_connection";
>+	public static final String PERSISTENCE_XML_GENERAL = PREFIX + "persistence_general";
>+	public static final String PERSISTENCE_XML_PROPERTIES  = PREFIX + "persistence_properties";
>+	public static final String PERSISTENCE_XML_SOURCE  = PREFIX + "persistence_source";
>+
>+	//New JPA Entity wizard
>+	public static final String NEW_JPA_ENTITY_ENTITY_CLASS  = PREFIX + "dialog_entityClassPage";
>+	public static final String NEW_JPA_ENTITY_ENTITY_PROPERTIES  = PREFIX + "dialog_entityPropertiesPage";
>+	
>+	//Generate Entities Wizard
>+	public static final String GENERATE_ENTITIES_WIZARD_ASSOCIATION_CARDINALITY = PREFIX + "dialog_associationCardinalityPage";
>+	public static final String GENERATE_ENTITIES_WIZARD_ASSOCIATION_TABLES = PREFIX + "dialog_associationTablesPage";
>+	public static final String GENERATE_ENTITIES_WIZARD_CUSTOMIZE_DEFAULT_ENTITY_GENERATION = PREFIX + "dialog_customizeDefaultEntityGeneration";
>+	public static final String GENERATE_ENTITIES_WIZARD_CUSTOMIZE_INDIVIDUAL_ENTITIES = PREFIX + "dialog_customizeIndividualEntities";
>+	public static final String GENERATE_ENTITIES_WIZARD_JOIN_COLUMNS = PREFIX + "dialog_joinColumnsPage";
>+	public static final String GENERATE_ENTITIES_WIZARD_SELECT_CASCADE = PREFIX + "dialog_selectCascade";
>+	public static final String GENERATE_ENTITIES_WIZARD_SELECT_TABLES = PREFIX + "dialog_selectTablesPage";
>+	public static final String GENERATE_ENTITIES_WIZARD_TABLE_ASSOCIATIONS = PREFIX + "dialog_tableAssociationsPage";
>+
> }
>Index: src/org/eclipse/jpt/ui/internal/wizards/entity/EntityFieldsWizardPage.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/EntityFieldsWizardPage.java,v
>retrieving revision 1.3
>diff -u -r1.3 EntityFieldsWizardPage.java
>--- src/org/eclipse/jpt/ui/internal/wizards/entity/EntityFieldsWizardPage.java	8 Oct 2008 17:31:17 -0000	1.3
>+++ src/org/eclipse/jpt/ui/internal/wizards/entity/EntityFieldsWizardPage.java	7 May 2009 17:06:10 -0000
>@@ -13,6 +13,7 @@
> 
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.jface.dialogs.Dialog;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.jpt.ui.internal.wizards.entity.data.model.IEntityDataModelProperties;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.SelectionAdapter;
>@@ -24,6 +25,8 @@
> import org.eclipse.swt.widgets.Group;
> import org.eclipse.swt.widgets.Label;
> import org.eclipse.swt.widgets.Text;
>+import org.eclipse.ui.PlatformUI;
>+import org.eclipse.ui.help.IWorkbenchHelpSystem;
> import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
> import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
> import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
>@@ -63,6 +66,8 @@
> 	protected Composite createTopLevelComposite(Composite parent) {
> 		Composite composite = new Composite(parent, SWT.NULL);
> 		composite.setLayout(new GridLayout());
>+		this.getHelpSystem().setHelp(composite, JpaHelpContextIds.NEW_JPA_ENTITY_ENTITY_PROPERTIES);
>+		
> 		GridData data = new GridData(GridData.FILL_BOTH);
> 		data.widthHint = 300;
> 		data.heightHint = 450;
>@@ -218,7 +223,11 @@
> 			tableNameCheckButton.setEnabled(!isNonEntity);
> 			tableNameText.setEnabled(!tableNameCheckButton.getSelection());
> 		}		
>-	}	
>+	}
>+	
>+	protected final IWorkbenchHelpSystem getHelpSystem() {
>+		return PlatformUI.getWorkbench().getHelpSystem();
>+	}
> }
> 
> 
>Index: src/org/eclipse/jpt/ui/internal/wizards/entity/EntityClassWizardPage.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/entity/EntityClassWizardPage.java,v
>retrieving revision 1.11
>diff -u -r1.11 EntityClassWizardPage.java
>--- src/org/eclipse/jpt/ui/internal/wizards/entity/EntityClassWizardPage.java	22 Apr 2009 19:36:28 -0000	1.11
>+++ src/org/eclipse/jpt/ui/internal/wizards/entity/EntityClassWizardPage.java	7 May 2009 17:06:10 -0000
>@@ -28,6 +28,7 @@
> import org.eclipse.jpt.core.JptCorePlugin;
> import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
> import org.eclipse.jpt.ui.JptUiPlugin;
>+import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
> import org.eclipse.jpt.ui.internal.jface.XmlMappingFileViewerFilter;
> import org.eclipse.jpt.ui.internal.wizards.entity.data.model.IEntityDataModelProperties;
> import org.eclipse.jpt.utility.internal.CollectionTools;
>@@ -46,7 +47,9 @@
> import org.eclipse.swt.widgets.Label;
> import org.eclipse.swt.widgets.Shell;
> import org.eclipse.swt.widgets.Text;
>+import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
>+import org.eclipse.ui.help.IWorkbenchHelpSystem;
> import org.eclipse.ui.model.WorkbenchContentProvider;
> import org.eclipse.ui.model.WorkbenchLabelProvider;
> import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
>@@ -97,6 +100,8 @@
> 	@Override
> 	protected Composite createTopLevelComposite(Composite parent) {
> 		Composite composite = super.createTopLevelComposite(parent);
>+		this.getHelpSystem().setHelp(composite, JpaHelpContextIds.NEW_JPA_ENTITY_ENTITY_CLASS);
>+		
> 		createInheritanceControl(composite);
> 		inheritanceButton.addSelectionListener(new SelectionAdapter() {
> 			@Override
>@@ -379,5 +384,9 @@
> 			output = output.replace(File.separatorChar, SLASH);
> 			return output;
> 		}
>-	}	
>+	}
>+	
>+	protected final IWorkbenchHelpSystem getHelpSystem() {
>+		return PlatformUI.getWorkbench().getHelpSystem();
>+	}
> }
>#P org.eclipse.jpt.doc.user
>Index: contexts.xml
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml,v
>retrieving revision 1.4
>diff -u -r1.4 contexts.xml
>--- contexts.xml	1 May 2009 16:46:14 -0000	1.4
>+++ contexts.xml	7 May 2009 17:06:14 -0000
>@@ -417,7 +417,7 @@
> 	</context>
> 
> 	<context id="caching_defaultType">
>-		<description>Select the default caching strategy for the project. The default is Weak with hard subcache.</description>
>+		<description>Select the default caching strategy for the project. The default is Weak with Soft Subcache.</description>
> 		<topic label="persistence.xml editor" href="ref_persistence_xml_editor" />
> 		<topic label="Managing the persistence.xml file" href="task_manage_persistence" />
> 	</context>

Actions: View | Diff

Attachments on bug 261107: 130276 | 130279 | 133168 | 133170 | 134048 | 134049 | 134700 | 134819