You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jk...@apache.org on 2019/06/15 15:38:06 UTC

[ant] branch master updated: sorry for messing up with tabs

This is an automated email from the ASF dual-hosted git repository.

jkf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git


The following commit(s) were added to refs/heads/master by this push:
     new 4af2316  sorry for messing up with tabs
4af2316 is described below

commit 4af231688855cfc59c11e24250852158b3eeb3f8
Author: jkf <jm...@famkruithof.net>
AuthorDate: Sat Jun 15 17:37:44 2019 +0200

    sorry for messing up with tabs
---
 .../org/apache/tools/ant/taskdefs/Javadoc.java     | 48 ++++++++++------------
 .../ant/taskdefs/compilers/JavacExternal.java      | 14 +++----
 2 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
index 6a433fa..bca0e0b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -1847,9 +1847,9 @@ public class Javadoc extends Task {
         doModuleArguments(toExecute);
 
         doTags(toExecute);
-		doSource(toExecute);
-		doLinkSource(toExecute);
-		doNoqualifier(toExecute);
+        doSource(toExecute);
+        doLinkSource(toExecute);
+        doNoqualifier(toExecute);
 		
         if (breakiterator) {
             toExecute.createArgument().setValue("-breakiterator");
@@ -2212,29 +2212,28 @@ public class Javadoc extends Task {
     }
 
     private void doNoqualifier(final Commandline toExecute) {
-		if (noqualifier != null && doclet == null) {
+        if (noqualifier != null && doclet == null) {
             toExecute.createArgument().setValue("-noqualifier");
             toExecute.createArgument().setValue(noqualifier);
         }
-	}
+    }
 
-	private void doLinkSource(final Commandline toExecute) {
-		if (linksource && doclet == null) {
+    private void doLinkSource(final Commandline toExecute) {
+        if (linksource && doclet == null) {
             toExecute.createArgument().setValue("-linksource");
         }
-	}
+    }
 
-	private void doSource(final Commandline toExecute) {
-		final String sourceArg = source != null ? source
-            : getProject().getProperty(MagicNames.BUILD_JAVAC_SOURCE);
+    private void doSource(final Commandline toExecute) {
+        final String sourceArg = source != null ? source : getProject().getProperty(MagicNames.BUILD_JAVAC_SOURCE);
         if (sourceArg != null) {
             toExecute.createArgument().setValue("-source");
             toExecute.createArgument().setValue(sourceArg);
         }
-	}
+    }
 
-	private void doTags(final Commandline toExecute) {
-		for (final Object element : tags) {
+    private void doTags(final Commandline toExecute) {
+        for (final Object element : tags) {
             if (element instanceof TagArgument) {
                 final TagArgument ta = (TagArgument) element;
                 final File tagDir = ta.getDir(getProject());
@@ -2247,39 +2246,34 @@ public class Javadoc extends Task {
                     // The tag element is used as a
                     // fileset. Parse all the files and create
                     // -tag arguments.
-                    final DirectoryScanner tagDefScanner =
-                        ta.getDirectoryScanner(getProject());
+                    final DirectoryScanner tagDefScanner = ta.getDirectoryScanner(getProject());
                     for (String file : tagDefScanner.getIncludedFiles()) {
                         final File tagDefFile = new File(tagDir, file);
-                        try (final BufferedReader in = new BufferedReader(
-                                new FileReader(tagDefFile))) {
+                        try (final BufferedReader in = new BufferedReader(new FileReader(tagDefFile))) {
                             in.lines().forEach(line -> {
                                 toExecute.createArgument().setValue("-tag");
                                 toExecute.createArgument().setValue(line);
                             });
                         } catch (final IOException ioe) {
-                            throw new BuildException("Couldn't read tag file from "
-                                    + tagDefFile.getAbsolutePath(), ioe);
+                            throw new BuildException("Couldn't read tag file from " + tagDefFile.getAbsolutePath(),
+                                    ioe);
                         }
                     }
                 }
             } else {
                 final ExtensionInfo tagletInfo = (ExtensionInfo) element;
                 toExecute.createArgument().setValue("-taglet");
-                toExecute.createArgument().setValue(tagletInfo
-                                                    .getName());
+                toExecute.createArgument().setValue(tagletInfo.getName());
                 if (tagletInfo.getPath() != null) {
-                    final Path tagletPath = tagletInfo.getPath()
-                        .concatSystemClasspath("ignore");
+                    final Path tagletPath = tagletInfo.getPath().concatSystemClasspath("ignore");
                     if (!tagletPath.isEmpty()) {
-                        toExecute.createArgument()
-                            .setValue("-tagletpath");
+                        toExecute.createArgument().setValue("-tagletpath");
                         toExecute.createArgument().setPath(tagletPath);
                     }
                 }
             }
         }
-	}
+    }
 
     private void doDocFilesSubDirs(final Commandline toExecute) {
         if (docFilesSubDirs) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java b/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java
index 5627fa9..9569c7f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java
@@ -64,13 +64,13 @@ public class JavacExternal extends DefaultCompilerAdapter {
 
         String[] commandLine = cmd.getCommandline();
         int firstFileName;
-        
-		if (assumeJava1_2Plus()) {
-			firstFileName = moveJOptionsToBeginning(commandLine);
-		} else {
-			firstFileName = -1;
-		}
-        
+
+        if (assumeJava1_2Plus()) {
+            firstFileName = moveJOptionsToBeginning(commandLine);
+        } else {
+            firstFileName = -1;
+        }
+
         return executeExternalCompile(commandLine, firstFileName,
                 true)
                 == 0;