summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Jongman2012-11-06 10:50:27 (EST)
committer Sopot Cela2012-11-06 10:50:27 (EST)
commitd04546d871690b4cccb03deb6ef2dc8e601bb021 (patch)
tree55f6e2eb4a4b83ba1e78e1c018474e57aa301a84
parent6bf12fcd55714a750e46732b0ee77ac4a06bc72c (diff)
downloadorg.eclipse.e4.tools-d04546d871690b4cccb03deb6ef2dc8e601bb021.zip
org.eclipse.e4.tools-d04546d871690b4cccb03deb6ef2dc8e601bb021.tar.gz
org.eclipse.e4.tools-d04546d871690b4cccb03deb6ef2dc8e601bb021.tar.bz2
Bug 393144 - E4 Application wizard does not include all artifacts inI20121108-2200I20121106-2200
build.properties
-rw-r--r--bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/project/E4NewProjectWizard.java16
1 files changed, 13 insertions, 3 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 ed3268f..679706b 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
@@ -101,12 +101,14 @@ import org.osgi.framework.Version;
*/
public class E4NewProjectWizard extends NewPluginProjectWizard {
+ private static final String PLUGIN_XML = "plugin.xml";
private static final String MODEL_EDITOR_ID = "org.eclipse.e4.tools.emf.editor3x.e4wbm";
private static final String APPLICATION_MODEL = "Application.e4xmi";
private PluginFieldData fPluginData;
private NewApplicationWizardPage fApplicationPage;
private IProjectProvider fProjectProvider;
private PluginContentPage fContentPage;
+ private boolean isMinimalist;
public E4NewProjectWizard() {
fPluginData = new PluginFieldData();
@@ -257,8 +259,16 @@ public class E4NewProjectWizard extends NewPluginProjectWizard {
WorkspaceBuildModel model = new WorkspaceBuildModel(file);
IBuildEntry e = model.getBuild().getEntry(IBuildEntry.BIN_INCLUDES);
- e.addToken("plugin.xml");
-
+ e.addToken(PLUGIN_XML);
+ e.addToken(APPLICATION_MODEL);
+
+ // Event though an icons directory is always created
+ // it seems appropriate to only add it if it contains
+ // some content
+ if (!isMinimalist) {
+ e.addToken("icons/");
+ }
+
Map<String, String> map = fApplicationPage.getData();
String cssEntry = map.get(NewApplicationWizardPage.APPLICATION_CSS_PROPERTY);
if( cssEntry != null ) {
@@ -358,7 +368,7 @@ public class E4NewProjectWizard extends NewPluginProjectWizard {
public void createApplicationResources(IProject project,
IProgressMonitor monitor) {
Map<String, String> map = fApplicationPage.getData();
- boolean isMinimalist = !map.get(NewApplicationWizardPage.richSample).equalsIgnoreCase("TRUE");
+ isMinimalist = !map.get(NewApplicationWizardPage.richSample).equalsIgnoreCase("TRUE");
if (map == null
|| map.get(NewApplicationWizardPage.PRODUCT_NAME) == null)
return;