From 218c6e4d50a647757330d65329584983c0aa5976 Mon Sep 17 00:00:00 2001
From: nhauge
Date: Wed, 14 Jul 2010 21:44:57 +0000
Subject: [295727] fix-up some jpa 2.0 help id's.

---
 jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml                      | 2 +-
 .../src/org/eclipse/jpt/ui/internal/JpaHelpContextIds.java             | 3 ++-
 .../eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java   | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml b/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml
index 2134b2bb05..a7a661aa44 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/contexts.xml
@@ -618,7 +618,7 @@ For example: "lastName ASC ,salary DESC"	</description>
 		<topic label="Project properties" href="ref_project_properties"/>
 		<topic label="Understanding persistence" href="concept_persistence.htm"/>
 	</context>
-	<context id="entity_cachable">
+	<context id="entity_cacheable">
 		<description>Specify if the entity uses the @Cachable annotation. Default is @Cachable(false).</description>
 		<topic label="JPA Details" href="ref_persistence_prop_view.htm"/>
 		<topic label="Understanding persistence" href="concept_persistence.htm"/>
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaHelpContextIds.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaHelpContextIds.java
index 4136e0e707..06318dda0f 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaHelpContextIds.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaHelpContextIds.java
@@ -100,7 +100,8 @@ public interface JpaHelpContextIds {
 	public static final String PROPERTIES_JAVA_PERSISTENCE = PREFIX + "properties_javaPersistence";
 	public static final String PROPERTIES_JAVA_PERSISTENCE_CONNECTION = PREFIX + "properties_javaPersistenceConnection";
 	public static final String PROPERTIES_JAVA_PERSISTENCE_SCHEMA = PREFIX + "properties_javaPersistenceSchema";
-
+	public static final String PROPERTIES_JAVA_PERSISTENCE_METAMODEL = PREFIX + "properties_canonicalMetamodel";
+	
 	//Dialogs, Wizards
 	public static final String DIALOG_CREATE_ORM = PREFIX + "dialog_createORM";
 	public static final String DIALOG_EDIT_INVERSE_JOIN_COLUNN = PREFIX + "dialog_editInverseJoinColumn";
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java
index 55646282c4..6cc64a8062 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java
@@ -652,6 +652,8 @@ public class JpaProjectPropertiesPage
 				SIMPLE_STRING_CONVERTER
 		);
 
+		PlatformUI.getWorkbench().getHelpSystem().setHelp(group, JpaHelpContextIds.PROPERTIES_JAVA_PERSISTENCE_METAMODEL);
+		
 		SWTTools.controlVisibleState(this.jpa2_0ProjectFlagModel, group, metamodelSourceFolderLink, metamodelSourceFolderDropDown);
 	}
 
-- 
cgit v1.2.3