Bug 412059 - E4NewProjectWizard uses product name to construct
platform:/plugin/ URIs
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
index c8c2ca8..cf120f5 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java
@@ -284,7 +284,7 @@
String cssValue = map
.get(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY);
if (cssValue != null) {
- cssValue = "platform:/plugin/" + productName + "/" + cssValue;
+ cssValue = "platform:/plugin/" + fPluginData.getId() + "/" + cssValue;
map.put(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY,
cssValue);
}
@@ -357,7 +357,7 @@
// If the project has invalid characters, the plug-in name would replace
// them with underscores, product name does the same
- String pluginName = map.get(NewApplicationWizardPage.PRODUCT_NAME);
+ String pluginName = fPluginData.getId();
// If there's no Activator created we create default package
if (!fPluginData.doGenerateClass()) {
@@ -412,6 +412,7 @@
Map<String, String> keys = new HashMap<String, String>();
keys.put("projectName", pluginName);
+ keys.put("productFileName", map.get(NewApplicationWizardPage.PRODUCT_NAME));
String elementName = fragment.getElementName();
keys.put("packageName", (elementName.equals("") ? "" : elementName
+ ".")
diff --git a/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product b/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product
similarity index 100%
rename from bundles/org.eclipse.e4.tools/templates/common/$projectName$.product
rename to bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product
