414830 - Fix up cheat sheets, including externalizing some strings.

4 files changed, 7 insertions, 21 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/add_persistence.xml b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/add_persistence.xml
index 6dbeedbeca..982a4bfa57 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/add_persistence.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/add_persistence.xml
@@ -18,8 +18,6 @@ Create a database profile and connect to the database.
 
 The Database Connection dialog automatically appears when you click the "Click to Perform" button.
       </description>
-      <command serialization="org.eclipse.datatools.sqltools.sqleditor.attachProfileAction" confirm="false">
-      </command>
    </item>
    <item title="Create a JPA Project" dialog="false" skip="false" href="/org.eclipse.jpt.doc.user/task_create_new_project.htm">
       <description>
@@ -32,8 +30,6 @@ Click <b>Next</b> to display the next page of the wizard.
 
 The &quot;New JPA Project&quot; wizard is automatically displayed when you click the &quot;Click to Perform&quot; button.
       </description>
-      <action class="org.eclipse.jdt.internal.ui.wizards.OpenProjectWizardAction" pluginId="org.eclipse.jdt.ui" confirm="false">
-      </action>
    </item>
    <item title="Select Project Facet" dialog="false" skip="false" href="/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.html">
       <description>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/create_entity.xml b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/create_entity.xml
index fd91891cfc..06640652ad 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/create_entity.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/create_entity.xml
@@ -15,7 +15,6 @@ If not, select <b>File->New->Project...</b> and choose <b>JPA->JPA Project</b> i
       </description>

 	</item>

 	<item title="Open the JPA Development Perspective" skip="true" href="/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm">

-		<action pluginId="org.eclipse.ui.cheatsheets" class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" param1="org.eclipse.jpt.ui.PersistencePerspective"/>

 		<description>

 When working with JPA  persistence, you should use the Persistence perspective. If you already have the Persistence perspective active, you may skip this step by clicking the "Click to Skip" button. 

 If not, select <b>Window->Open Perspective->Other</b> in the menubar at the top of the workbench. In the Select Perspectives dialog, select <b>JPA Development</b> and click OK. This step changes the perspective to set up the Eclipse workbench for JPA development.

diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/map_entity.xml b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/map_entity.xml
index 63307f226e..2295a635a2 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/map_entity.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/map_entity.xml
@@ -20,8 +20,6 @@ If you already have (and are connected to) a database connection, you  may skip
 
 The Database Connection dialog automatically appears when you click the &quot;Click to Perform&quot; button.
       </description>
-      <command serialization="org.eclipse.datatools.sqltools.sqleditor.attachProfileAction" confirm="false">
-      </command>
    </item>
    <item title="Create a JPA Project" dialog="false" skip="true" href="/org.eclipse.jpt.doc.user/task_create_new_project.htm">
       <description>
@@ -34,8 +32,7 @@ The &quot;New JPA Project&quot; wizard is automatically displayed when you click
 
 If you already have a JPA project, you  may skip this step by clicking the &quot;Click to Skip&quot; button.
       </description>
-      <action class="org.eclipse.jdt.internal.ui.wizards.OpenProjectWizardAction" pluginId="org.eclipse.jdt.ui" confirm="false">
-      </action>
+
    </item>
    <item title="Open the JPA Development Perspective" dialog="false" skip="true" href="/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm">
       <description>
@@ -43,8 +40,6 @@ If you already have a JPA project, you  may skip this step by clicking the &quot
 If not, select <b>Window-&gt;Open Perspective-&gt;Other</b> in the menubar at the top of the workbench. In the Select Perspectives dialog, select <b>JPA Development</b> and click OK. This step changes the perspective to set up the Eclipse workbench for JPA development.
 You can click the &quot;Click to Perform&quot; button to have the &quot;Persistence&quot; perspective opened automatically.
       </description>
-      <action class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" pluginId="org.eclipse.ui.cheatsheets" confirm="false" param1="org.eclipse.jpt.ui.PersistencePerspective">
-      </action>
    </item>
    <item title="Create a Java Class" dialog="false" skip="false">
       <description>
@@ -66,8 +61,6 @@ Use the Table, Catalog, and Schema fields to associate the entity with a specifi
 
 If your persistent entity already has fields to map, you may skip this step by clicking the &quot;Click to Skip&quot; button. If not, use the Java editor to add fields to the entity.
       </description>
-      <action class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" pluginId="org.eclipse.ui.cheatsheets" confirm="false" param1="org.eclipse.dali.ui.PersistencePerspective">
-      </action>
    </item>
    <item title="Create the Mapping" dialog="false" skip="false" href="/org.eclipse.dali.doc.user/ref_entity_page.htm">
       <description>
@@ -77,8 +70,6 @@ In the JPA Structure view, expand the persistent entity to display the fields. S
 
 The JPA Details view displays the information for the field. Use the Map As field to select the Basic mapping. Use the Column field to select a column from the database table.
       </description>
-      <action class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" pluginId="org.eclipse.ui.cheatsheets" confirm="false" param1="org.eclipse.dali.ui.PersistencePerspective">
-      </action>
    </item>
    <item title="Finish" dialog="false" skip="false">
       <description>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml b/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml
index f8e58baced..700061cc6e 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml
@@ -27,25 +27,25 @@
 		<category name="JPA Development"

 			id="org.eclipse.jpt.jpa.category"/>

 

-		<cheatsheet name="Create a JPA Project"

+		<cheatsheet name="%createAJpaProject"

 			id="org.eclipse.jpt.jpa.cheatsheet.CreateJpaProject"

 			contentFile="$nl$/cheatsheets/add_persistence.xml"

 			category="org.eclipse.jpt.jpa.category">

-			<description>Learn how to create a JPA project.</description>

+			<description>%createAJpaProjectDescription</description>

 		</cheatsheet>

 

-		<cheatsheet name="Create a Persistent Entity"

+		<cheatsheet name="%createAPersistentEntity"

 			id="org.eclipse.jpt.jpa.cheatsheet.AddEntity"

 			contentFile="$nl$/cheatsheets/create_entity.xml"

 			category="org.eclipse.jpt.jpa.category">

-			<description>Learn how to add a persistent entity to a Java project.</description>

+			<description>%createAPersistentEntityDescription</description>

 		</cheatsheet>

 

-		<cheatsheet name="Map a Persistent Entity"

+		<cheatsheet name="%MapAPersistentEntity"

 			id="org.eclipse.jpt.jpa.cheatsheet.MapEntity"

 			contentFile="$nl$/cheatsheets/map_entity.xml"

 			category="org.eclipse.jpt.jpa.category">

-			<description>Learn how to map a persistent entity to a database.</description>

+			<description>%MapAPersistentEntityDescription</description>

 		</cheatsheet>

 

 	</extension>