diff options
| author | Sopot Cela | 2013-07-04 13:57:15 +0000 |
|---|---|---|
| committer | Sopot Cela | 2013-07-04 13:57:15 +0000 |
| commit | 27dea4303d4b5c8c25b49cfb34e0298dde4afa42 (patch) | |
| tree | 6d753df449eb71d3624f1afc9ccbd773896e6c38 | |
| parent | e7e383d3f50ab7286aefd5e88a1f7e64716553d8 (diff) | |
| download | org.eclipse.e4.tools-27dea4303d4b5c8c25b49cfb34e0298dde4afa42.tar.gz org.eclipse.e4.tools-27dea4303d4b5c8c25b49cfb34e0298dde4afa42.tar.xz org.eclipse.e4.tools-27dea4303d4b5c8c25b49cfb34e0298dde4afa42.zip | |
Bug 412059 - E4NewProjectWizard uses product name to constructI20130710-0900I20130709-2200I20130708-2200I20130707-2200I20130706-2200I20130705-2200I20130704-2200
platform:/plugin/ URIs
| -rw-r--r-- | bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java | 5 | ||||
| -rw-r--r-- | bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product (renamed from bundles/org.eclipse.e4.tools/templates/common/$projectName$.product) | 0 |
2 files changed, 3 insertions, 2 deletions
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 c8c2ca83..cf120f5e 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 @@ public class E4NewProjectWizard extends NewPluginProjectWizard { 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 @@ public class E4NewProjectWizard extends NewPluginProjectWizard { // 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 @@ public class E4NewProjectWizard extends NewPluginProjectWizard { 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 index 01daa061..01daa061 100644 --- a/bundles/org.eclipse.e4.tools/templates/common/$projectName$.product +++ b/bundles/org.eclipse.e4.tools/templates/common/$productFileName$.product |