Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonah Graham2018-11-20 16:20:42 +0000
committerJonah Graham2018-11-22 21:47:02 +0000
commit170e654b4796bad1453ae85a427b97317d67a69a (patch)
tree6ca9b8a8fedd5fd25f97eb79c408312e256ff981 /build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/posix/PosixMakefile.java
parent35996a5c5ca5c254959ba48241eaada6dbf8628d (diff)
downloadorg.eclipse.cdt-170e654b4796bad1453ae85a427b97317d67a69a.tar.gz
org.eclipse.cdt-170e654b4796bad1453ae85a427b97317d67a69a.tar.xz
org.eclipse.cdt-170e654b4796bad1453ae85a427b97317d67a69a.zip
Bug 540373: Cleanup: Format & Remove trailing whitespace
This was done by selecting all projects in Eclipse then Source -> Clean Up... -> choosing: - Format source code - Remove trailing white spaces on all lines and completing the wizard Change-Id: I63685372c6bcc67719bcf145123bcb72e5b00394
Diffstat (limited to 'build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/posix/PosixMakefile.java')
-rw-r--r--build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/posix/PosixMakefile.java15
1 files changed, 7 insertions, 8 deletions
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/posix/PosixMakefile.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/posix/PosixMakefile.java
index ad1e6664a05..18017728947 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/posix/PosixMakefile.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/posix/PosixMakefile.java
@@ -86,14 +86,13 @@ public class PosixMakefile extends AbstractMakefile {
}
@Override
- public void parse(URI fileURI,
- IMakefileReaderProvider makefileReaderProvider) throws IOException {
+ public void parse(URI fileURI, IMakefileReaderProvider makefileReaderProvider) throws IOException {
this.makefileReaderProvider = makefileReaderProvider;
MakefileReader reader;
if (makefileReaderProvider == null) {
try {
- reader = new MakefileReader(new InputStreamReader(
- EFS.getStore(fileURI).openInputStream(EFS.NONE, null)));
+ reader = new MakefileReader(
+ new InputStreamReader(EFS.getStore(fileURI).openInputStream(EFS.NONE, null)));
} catch (CoreException e) {
MakeCorePlugin.log(e);
throw new IOException(e.getMessage());
@@ -165,7 +164,7 @@ public class PosixMakefile extends AbstractMakefile {
// 3- Empty lines ?
if (Util.isEmptyLine(line)) {
- Directive empty = new EmptyLine(this);
+ Directive empty = new EmptyLine(this);
empty.setLines(startLine, endLine);
if (rules != null) {
for (Rule rule : rules) {
@@ -197,7 +196,7 @@ public class PosixMakefile extends AbstractMakefile {
InferenceRule irule = parseInferenceRule(line);
irule.setLines(startLine, endLine);
addDirective(irule);
- rules = new Rule[]{irule};
+ rules = new Rule[] { irule };
continue;
}
@@ -235,15 +234,15 @@ public class PosixMakefile extends AbstractMakefile {
public IDirective[] getBuiltins() {
return builtins;
}
+
@Override
public IAutomaticVariable[] getAutomaticVariables() {
return automaticVariables;
}
-
protected SpecialRule processSpecialRule(String line) {
line = line.trim();
- String keyword = null;
+ String keyword = null;
String[] reqs = null;
SpecialRule special = null;
int index = Util.indexOf(line, ':');

Back to the top