Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Treggiari2004-12-16 22:36:54 -0500
committerLeo Treggiari2004-12-16 22:36:54 -0500
commit8a4e0dde3acefe076ccb66adc2382c72a74cee41 (patch)
treef5ca0235c9fdb4689bef1fa4b29d1bd0960764ec
parent7560868e493098ebac5e97b3fa405942901232f2 (diff)
downloadorg.eclipse.cdt-8a4e0dde3acefe076ccb66adc2382c72a74cee41.tar.gz
org.eclipse.cdt-8a4e0dde3acefe076ccb66adc2382c72a74cee41.tar.xz
org.eclipse.cdt-8a4e0dde3acefe076ccb66adc2382c72a74cee41.zip
Fix getCommandLinePattern method to check its superclass if the Tool's value is null
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
index cef6eefb0c..5411037cb8 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
@@ -1104,11 +1104,14 @@ public class Tool extends BuildObject implements ITool, IOptionCategory {
* @see org.eclipse.cdt.managedbuilder.core.ITool#getCommandLinePattern()
*/
public String getCommandLinePattern() {
- if (commandLinePattern != null) {
- return commandLinePattern;
- } else {
- return new String(DEFAULT_PATTERN); // Default pattern
+ if (commandLinePattern == null) {
+ if (superClass != null) {
+ return superClass.getCommandLinePattern();
+ } else {
+ return new String(DEFAULT_PATTERN); // Default pattern
+ }
}
+ return commandLinePattern;
}
/* (non-Javadoc)

Back to the top