You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by pe...@apache.org on 2007/10/05 11:32:53 UTC
svn commit: r582163 - in
/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant:
taskdefs/Rmic.java taskdefs/optional/depend/Depend.java
util/ResourceUtils.java
Author: peterreilly
Date: Fri Oct 5 02:32:51 2007
New Revision: 582163
URL: http://svn.apache.org/viewvc?rev=582163&view=rev
Log:
sync: checkstyle
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Rmic.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/ResourceUtils.java
Modified: ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Rmic.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Rmic.java?rev=582163&r1=582162&r2=582163&view=diff
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Rmic.java (original)
+++ ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Rmic.java Fri Oct 5 02:32:51 2007
@@ -530,7 +530,7 @@
String path = classname.replace('.', File.separatorChar) + ".class";
File f = new File(baseDir, path);
if (f.isFile()) {
- scanDir(baseDir, new String[] { path }, adapter.getMapper());
+ scanDir(baseDir, new String[] {path}, adapter.getMapper());
} else {
// Does not exist, so checking whether it is up to date makes no sense.
// Compilation will fail later anyway, but tests expect a certain output.
Modified: ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java?rev=582163&r1=582162&r2=582163&view=diff
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java (original)
+++ ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java Fri Oct 5 02:32:51 2007
@@ -773,7 +773,8 @@
* Find the source file for a given class
*
* @param classname the classname in slash format.
- * @param sourceFileKnownToExist if not null, a file already known to exist (saves call to .exists())
+ * @param sourceFileKnownToExist if not null, a file already known to exist
+ * (saves call to .exists())
*/
private File findSourceFile(String classname, File sourceFileKnownToExist) {
String sourceFilename;
@@ -826,7 +827,8 @@
file.getPath().length() - ".class".length());
info.className
= ClassFileUtils.convertSlashName(relativeName);
- info.sourceFile = sourceFileKnownToExist = findSourceFile(relativeName, sourceFileKnownToExist);
+ info.sourceFile = sourceFileKnownToExist = findSourceFile(
+ relativeName, sourceFileKnownToExist);
classFileList.addElement(info);
} else {
addClassFiles(classFileList, file, root);
Modified: ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/ResourceUtils.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/ResourceUtils.java?rev=582163&r1=582162&r2=582163&view=diff
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/ResourceUtils.java (original)
+++ ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/ResourceUtils.java Fri Oct 5 02:32:51 2007
@@ -43,11 +43,8 @@
import org.apache.tools.ant.types.resources.Restrict;
import org.apache.tools.ant.types.resources.Resources;
import org.apache.tools.ant.types.resources.Touchable;
-import org.apache.tools.ant.types.resources.selectors.Or;
-import org.apache.tools.ant.types.resources.selectors.And;
import org.apache.tools.ant.types.resources.selectors.Not;
import org.apache.tools.ant.types.resources.selectors.Date;
-import org.apache.tools.ant.types.resources.selectors.Type;
import org.apache.tools.ant.types.resources.selectors.Exists;
import org.apache.tools.ant.types.resources.selectors.ResourceSelector;
import org.apache.tools.ant.types.selectors.SelectorUtils;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
Re: svn commit: r582163 - in /ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant: taskdefs/Rmic.java taskdefs/optional/depend/Depend.java util/ResourceUtils.java
Posted by Peter Reilly <pe...@gmail.com>.
On 10/5/07, Jesse Glick <je...@sun.com> wrote:
> peterreilly@apache.org wrote:
> > URL: http://svn.apache.org/viewvc?rev=582163&view=rev
> > sync: checkstyle
>
> Harmless of course, but is there a reason to merge formatting-only
> changes to a branch? My assumption was that only a minimum of patches
> should be made in a branch, to fix real bugs, so that you could more
> easily find diffs representing behavior changes between minor releases.
This is true.
Peter
>
> -J.
>
> --
> jesse.glick@sun.com netbeans.org ant.apache.org hudson.dev.java.net
> http://google.com/search?q=e%5E%28pi*i%29%2B1
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
> For additional commands, e-mail: dev-help@ant.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
Re: svn commit: r582163 - in /ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant:
taskdefs/Rmic.java taskdefs/optional/depend/Depend.java util/ResourceUtils.java
Posted by Jesse Glick <je...@sun.com>.
peterreilly@apache.org wrote:
> URL: http://svn.apache.org/viewvc?rev=582163&view=rev
> sync: checkstyle
Harmless of course, but is there a reason to merge formatting-only
changes to a branch? My assumption was that only a minimum of patches
should be made in a branch, to fix real bugs, so that you could more
easily find diffs representing behavior changes between minor releases.
-J.
--
jesse.glick@sun.com netbeans.org ant.apache.org hudson.dev.java.net
http://google.com/search?q=e%5E%28pi*i%29%2B1
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org