Fix E4ApplicationTemplate to respect sample content checkbox for icons

When creating a new Eclipse RCP project using the "Eclipse RCP
application" template, the icons/ folder was always created in the
project structure, even when the "Create sample content (part, menu,
command...)" checkbox was unchecked. This violated user expectations and
created unnecessary files.

With this change the icons folder is now conditionally included based on
the checkbox state.

Author: vogella

ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/e4/E4ApplicationTemplate.java

@@ -153,7 +153,7 @@ private void createProductExtension() throws CoreException {
 	protected boolean isOkToCreateFolder(File sourceFolder) {
 		// We copy the files in 'org.eclipse.pde.ui.templates/templates_3.5/E4Application/*/handlers' or 'parts' if content required
 		String fname = sourceFolder.getName();
-		if (fname.endsWith("handlers") || fname.endsWith("parts")) { //$NON-NLS-1$//$NON-NLS-2$
+		if (fname.endsWith("handlers") || fname.endsWith("parts") || fname.equals("icons")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
 			return getBooleanOption(KEY_CREATE_SAMPLE_CONTENT);
 		}
 		return super.isOkToCreateFolder(sourceFolder);
@@ -228,6 +228,9 @@ public IPluginReference[] getDependencies(String schemaVersion) {
 
 	@Override
 	public String[] getNewFiles() {
-		return new String[] { "icons/", "css/default.css", "Application.e4xmi" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		if (getBooleanOption(KEY_CREATE_SAMPLE_CONTENT)) {
+			return new String[] { "icons/", "css/default.css", "Application.e4xmi" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		}
+		return new String[] { "css/default.css", "Application.e4xmi" }; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 }