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

[jbosstools-commits at lists.jboss.org]

Author: fbricon
Date: 2012-09-26 03:49:48 -0400 (Wed, 26 Sep 2012)
New Revision: 44023

Modified:
   trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExample.java
   trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExampleDelegate.java
Log:
JBIDE-12711 Prevent projectExample to maintain welcomeUrl across different project generations for maven archetypes

Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExample.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExample.java	2012-09-26 07:46:23 UTC (rev 44022)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExample.java	2012-09-26 07:49:48 UTC (rev 44023)
@@ -183,7 +183,7 @@
 	}
 
 	public String getWelcomeURL() {
-		return welcomeURL;
+		return (welcomeURL == null) ? "" : welcomeURL;
 	}
 
 	public void setWelcomeURL(String welcomeURL) {

Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExampleDelegate.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExampleDelegate.java	2012-09-26 07:46:23 UTC (rev 44022)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExampleDelegate.java	2012-09-26 07:49:48 UTC (rev 44023)
@@ -50,6 +50,10 @@
 			projectDescription.setIncludedProjects(includedProjects);
 		}
 		projectDescription.getIncludedProjects().clear();
+		//JBIDE-12711 : reset welcomeURL for maven archetypes. 
+		projectDescription.setWelcomeURL(null);
+		projectDescription.setWelcome(false);
+		
 		String projectName = (String) propertiesMap.get(ProjectExamplesActivator.PROPERTY_PROJECT_NAME);
 		includedProjects.add(projectName);
 		String artifactId = (String) propertiesMap.get(ProjectExamplesActivator.PROPERTY_ARTIFACT_ID);