[jbosstools-commits] JBoss Tools SVN: r39467 - in trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples: wizard and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: snjeza
Date: 2012-03-13 06:46:13 -0400 (Tue, 13 Mar 2012)
New Revision: 39467

Modified:
   trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java
   trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesReadyPage.java
Log:
JBIDE-11285 welcome content of project examples broken

Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java	2012-03-13 10:43:07 UTC (rev 39466)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java	2012-03-13 10:46:13 UTC (rev 39467)
@@ -135,6 +135,7 @@
 	private static final String PERIOD_CHEATSHEET_XML = "/.cheatsheet.xml"; //$NON-NLS-1$
 	private static final String README_MD = "/readme.md"; //$NON-NLS-1$
 	private static final String README_TXT = "/readme.txt"; //$NON-NLS-1$
+	private static final String README_MDU = "/README.md"; //$NON-NLS-1$
 	
 	// The plug-in ID
 	public static final String PLUGIN_ID = "org.jboss.tools.project.examples"; //$NON-NLS-1$
@@ -336,7 +337,7 @@
 		return projects.toArray(new IProject[0]);
 	}
 
-	protected static String replace(String name, ProjectExample project) {
+	public static String replace(String name, ProjectExample project) {
 		List<String> includedProjects = project.getIncludedProjects();
 		if (includedProjects != null) {
 			int i = 0;
@@ -564,6 +565,10 @@
 					ProjectExampleUtil.EDITOR)) {
 				return;
 			}
+			if (checkCheatsheet(project, eclipseProject, README_MDU,
+					ProjectExampleUtil.EDITOR)) {
+				return;
+			}
 			if (checkCheatsheet(project, eclipseProject, README_TXT,
 					ProjectExampleUtil.EDITOR)) {
 				return;

Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesReadyPage.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesReadyPage.java	2012-03-13 10:43:07 UTC (rev 39466)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesReadyPage.java	2012-03-13 10:46:13 UTC (rev 39467)
@@ -67,7 +67,9 @@
 				if (projectExample.isWelcome()) {
 					showReadme.setEnabled(true);
 					showReadme.setSelection(true);
-					showReadme.setText("Show '" + projectExample.getWelcomeURL() + "' for further instructions");
+					String urlString = projectExample.getWelcomeURL();
+					String welcomeURL = ProjectExamplesActivator.replace(urlString, projectExample);
+					showReadme.setText("Show '" + welcomeURL + "' for further instructions");
 				} else {
 					showReadme.setEnabled(false);
 					showReadme.setSelection(false);