patch from Bala Torati with small modifications

1. Fix for [Bug 184449] [Template Engine] It should be possible to press "Finish" on the first wizard page for templates having default values assigned
2. Fix for [Bug 184593] [Template Engine] Need a way to add tool-chain associations to existing templates
3. Fix for [Bug 184455] [Template Engine] NPE in template engine tests

1 files changed, 1 insertions, 4 deletions

diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/TemplateProcessHandler.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/TemplateProcessHandler.java
index eab75afe3ca..6aab5776ac3 100644
--- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/TemplateProcessHandler.java
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/TemplateProcessHandler.java
@@ -77,13 +77,10 @@ public class TemplateProcessHandler {
 	 * @return
 	 */
 	public Set/*<String>*/ getAllMacros() {
-		Set/*<String>*/ set = null;
+		Set/*<String>*/ set = new HashSet/*<String>*/();
 		for (Iterator i = conditionalProcessGroupList.iterator(); i.hasNext();) {
 			Set/*<String>*/ subSet = ((ConditionalProcessGroup)i.next()).getAllMacros();
 			if (subSet != null) {
-				if (set == null) {
-					set = new HashSet/*<String>*/();
-				}
 				set.addAll(subSet);
 			}
 		}