diff options
Diffstat (limited to 'build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefileValidator.java')
| -rw-r--r-- | build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefileValidator.java | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefileValidator.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefileValidator.java index 49ebafc8034..d5ffa304e9c 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefileValidator.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefileValidator.java @@ -55,12 +55,11 @@ public class GNUMakefileValidator implements IMakefileValidator { @Override public void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar) { - ProblemMarkerInfo problemMarkerInfo = new ProblemMarkerInfo(file, lineNumber, errorDesc, severity, errorVar, null); + ProblemMarkerInfo problemMarkerInfo = new ProblemMarkerInfo(file, lineNumber, errorDesc, severity, + errorVar, null); addMarker(problemMarkerInfo); } - - /* (non-Javadoc) * @see org.eclipse.cdt.core.IMarkerGenerator#addMarker(org.eclipse.cdt.core.ProblemMarkerInfo) */ @@ -71,14 +70,15 @@ public class GNUMakefileValidator implements IMakefileValidator { name = problemMarkerInfo.file.getName(); } StringBuilder sb = new StringBuilder(name); - sb.append(':').append(problemMarkerInfo.lineNumber).append(':').append(getSeverity(problemMarkerInfo.severity)); + sb.append(':').append(problemMarkerInfo.lineNumber).append(':') + .append(getSeverity(problemMarkerInfo.severity)); if (problemMarkerInfo.description != null) { sb.append(':').append(problemMarkerInfo.description); } - if (problemMarkerInfo.variableName != null ) { + if (problemMarkerInfo.variableName != null) { sb.append(':').append(problemMarkerInfo.variableName); } - if (problemMarkerInfo.externalPath != null ) { + if (problemMarkerInfo.externalPath != null) { sb.append(':').append(problemMarkerInfo.externalPath); } sb.append('\n'); @@ -86,8 +86,6 @@ public class GNUMakefileValidator implements IMakefileValidator { } - - public String getSeverity(int severity) { if (severity == IMarkerGenerator.SEVERITY_ERROR_BUILD) { return MakefileMessages.getString("MakefileValidator.errorBuild"); //$NON-NLS-1$ @@ -141,7 +139,7 @@ public class GNUMakefileValidator implements IMakefileValidator { for (int i = 0; i < directives.length; i++) { directive = directives[i]; if (directive instanceof IConditional) { - IConditional condition = (IConditional)directive; + IConditional condition = (IConditional) directive; validateCondition(condition); if (!condition.isElse()) { conditionCount++; @@ -156,7 +154,7 @@ public class GNUMakefileValidator implements IMakefileValidator { } } } else if (directive instanceof ITerminal) { - ITerminal terminal = (ITerminal)directive; + ITerminal terminal = (ITerminal) directive; if (terminal.isEndif()) { if (conditionCount == 0) { // ERROR missing condition. @@ -181,7 +179,7 @@ public class GNUMakefileValidator implements IMakefileValidator { } } } else if (directive instanceof IVariableDefinition) { - IVariableDefinition definition = (IVariableDefinition)directive; + IVariableDefinition definition = (IVariableDefinition) directive; if (definition.isMultiLine()) { defineCount++; } @@ -193,7 +191,7 @@ public class GNUMakefileValidator implements IMakefileValidator { String varName = directive.toString().trim(); marker.addMarker(res, startLine, msg, severity, varName); } else if (directive instanceof ISpecialRule) { - validateSpecialRule((ISpecialRule)directive); + validateSpecialRule((ISpecialRule) directive); } } if (conditionCount > 0) { @@ -218,7 +216,7 @@ public class GNUMakefileValidator implements IMakefileValidator { int severity = IMarkerGenerator.SEVERITY_ERROR_RESOURCE; for (int i = directives.length - 1; i >= 0; i--) { if (directives[i] instanceof IVariableDefinition) { - IVariableDefinition definition = (IVariableDefinition)directives[i]; + IVariableDefinition definition = (IVariableDefinition) directives[i]; if (definition.isMultiLine()) { startLine = definition.getStartLine(); varName = definition.toString().trim(); |