Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlena Laskavaia2008-10-21 20:14:40 +0000
committerAlena Laskavaia2008-10-21 20:14:40 +0000
commitc952b7c60da89b9b2f5dd478ade399dbddd06785 (patch)
treeb4d1b4ef0d419247a345fb396f9b8c7685bde9ef /core/org.eclipse.cdt.core/templateengine
parentda9b11f4b6f0cf51c8fc6ed6350dfc65644d5cb4 (diff)
downloadorg.eclipse.cdt-c952b7c60da89b9b2f5dd478ade399dbddd06785.tar.gz
org.eclipse.cdt-c952b7c60da89b9b2f5dd478ade399dbddd06785.tar.xz
org.eclipse.cdt-c952b7c60da89b9b2f5dd478ade399dbddd06785.zip
[251124] - fixing language support templates
Diffstat (limited to 'core/org.eclipse.cdt.core/templateengine')
-rw-r--r--core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngine.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngine.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngine.java
index 4d122759972..944bc7fd4ff 100644
--- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngine.java
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngine.java
@@ -301,7 +301,7 @@ public class TemplateEngine {
if (toolChain != null) {
for (int j=0; j < toolChains.length; j++) {
if (toolChains[j].equals(toolChain)) {
- if (usageFilter != null && filterPattern.matches(usageFilter)) {
+ if ((usageFilter != null) && (filterPattern != null) && usageFilter.matches(filterPattern)) {
matchedTemplateInfoList.add(templateInfo);
} else if (usageFilter == null) {
matchedTemplateInfoList.add(templateInfo);
@@ -310,7 +310,7 @@ public class TemplateEngine {
}
}
} else {
- if (usageFilter != null && filterPattern.matches(usageFilter)) {
+ if ((usageFilter != null) && (filterPattern != null) && usageFilter.matches(filterPattern)) {
matchedTemplateInfoList.add(templateInfo);
} else if (usageFilter == null) {
matchedTemplateInfoList.add(templateInfo);

Back to the top