Author: peterreilly
Date: Fri Oct 5 02:32:10 2007
New Revision: 582162
URL: http://svn.apache.org/viewvc?rev=582162&view=rev
Log:
checkstyle
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Rmic.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
ant/core/trunk/src/main/org/apache/tools/ant/util/ResourceUtils.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Rmic.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Rmic.java?rev=582162&r1=582161&r2=582162&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Rmic.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Rmic.java Fri Oct 5
02:32:10 2007
@@ -527,7 +527,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/trunk/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java?rev=582162&r1=582161&r2=582162&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
Fri Oct 5 02:32:10 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/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java?rev=582162&r1=582161&r2=582162&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
Fri Oct 5 02:32:10 2007
@@ -150,16 +150,16 @@
if (command == null && commandResource == null) {
throw new BuildException("Command or commandResource is
required.");
}
-
+
Session session = null;
-
+
try {
session = openSession();
/* called once */
if (command != null) {
log("cmd : " + command, Project.MSG_INFO);
ByteArrayOutputStream out = executeCommand(session, command);
- if(outputProperty != null) {
+ if (outputProperty != null) {
//#bugzilla 43437
getProject().setNewProperty(outputProperty, command + " :
" + out);
}
@@ -174,7 +174,7 @@
ByteArrayOutputStream out = executeCommand(session,
cmd);
output += cmd + " : " + out + "\n";
}
- if(outputProperty != null) {
+ if (outputProperty != null) {
//#bugzilla 43437
getProject().setNewProperty(outputProperty, output);
}
@@ -183,7 +183,7 @@
throw new BuildException(e);
}
}
- } catch(JSchException e) {
+ } catch (JSchException e) {
throw new BuildException(e);
} finally {
if (session != null && session.isConnected()) {
@@ -191,8 +191,9 @@
}
}
}
-
- private ByteArrayOutputStream executeCommand(Session session, String cmd)
throws BuildException {
+
+ private ByteArrayOutputStream executeCommand(Session session, String cmd)
+ throws BuildException {
ByteArrayOutputStream out = new ByteArrayOutputStream();
TeeOutputStream tee = new TeeOutputStream(out, new
KeepAliveOutputStream(System.out));
Modified: ant/core/trunk/src/main/org/apache/tools/ant/util/ResourceUtils.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/ResourceUtils.java?rev=582162&r1=582161&r2=582162&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/util/ResourceUtils.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/util/ResourceUtils.java Fri
Oct 5 02:32:10 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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
