You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by jh...@apache.org on 2003/09/03 18:47:18 UTC
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Execute.java ExecuteJava.java ExecuteOn.java Exit.java Input.java
jhm 2003/09/03 09:47:18
Modified: src/main/org/apache/tools/ant/taskdefs Execute.java
ExecuteJava.java ExecuteOn.java Exit.java
Input.java
Log:
Checkstyle
Revision Changes Path
1.65 +4 -2 ant/src/main/org/apache/tools/ant/taskdefs/Execute.java
Index: Execute.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Execute.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- Execute.java 22 Aug 2003 15:25:44 -0000 1.64
+++ Execute.java 3 Sep 2003 16:47:17 -0000 1.65
@@ -307,11 +307,13 @@
try {
return bos.toString("Cp1047");
} catch (java.io.UnsupportedEncodingException e) {
+ //noop default encoding used
}
} else if (Os.isFamily("os/400")) {
try {
return bos.toString("Cp500");
} catch (java.io.UnsupportedEncodingException e) {
+ //noop default encoding used
}
}
return bos.toString();
@@ -1151,4 +1153,4 @@
}
}
-}
+}
\ No newline at end of file
1.37 +4 -4 ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
Index: ExecuteJava.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ExecuteJava.java 27 Aug 2003 14:23:16 -0000 1.36
+++ ExecuteJava.java 3 Sep 2003 16:47:17 -0000 1.37
@@ -104,7 +104,7 @@
public void setSystemProperties(CommandlineJava.SysProperties s) {
sysProperties = s;
}
-
+
/**
* Permissions for the application run.
* @since Ant 1.6
@@ -220,7 +220,7 @@
public void run() {
final Object[] argument = {javaCommand.getArguments()};
try {
- if(perm != null) {
+ if (perm != null) {
perm.setSecurityManager();
}
main.invoke(null, argument);
@@ -232,7 +232,7 @@
} catch (Throwable t) {
caught = t;
} finally {
- if(perm != null) {
+ if (perm != null) {
perm.restoreSecurityManager();
}
synchronized (this) {
@@ -258,4 +258,4 @@
public synchronized boolean killedProcess() {
return timedOut;
}
-}
+}
\ No newline at end of file
1.45 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
Index: ExecuteOn.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ExecuteOn.java 19 Jul 2003 11:20:12 -0000 1.44
+++ ExecuteOn.java 3 Sep 2003 16:47:17 -0000 1.45
@@ -311,7 +311,7 @@
}
if (!"file".equals(currentType)) {
- String[] s = getDirs(base, ds);;
+ String[] s = getDirs(base, ds);
for (int j = 0; j < s.length; j++) {
totalDirs++;
fileNames.addElement(s[j]);
@@ -615,4 +615,4 @@
return new String[] {"file", "dir", "both"};
}
}
-}
+}
\ No newline at end of file
1.22 +5 -1 ant/src/main/org/apache/tools/ant/taskdefs/Exit.java
Index: Exit.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Exit.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Exit.java 10 Feb 2003 14:13:34 -0000 1.21
+++ Exit.java 3 Sep 2003 16:47:17 -0000 1.22
@@ -98,6 +98,9 @@
unlessCondition = c;
}
+ /**
+ * Exits the actual build.
+ */
public void execute() throws BuildException {
if (testIfCondition() && testUnlessCondition()) {
if (message != null && message.length() > 0) {
@@ -110,6 +113,7 @@
/**
* Set a multiline message.
+ * @param msg the message to display
*/
public void addText(String msg) {
if (message == null) {
@@ -133,4 +137,4 @@
return getProject().getProperty(unlessCondition) == null;
}
-}
+}
\ No newline at end of file
1.22 +4 -3 ant/src/main/org/apache/tools/ant/taskdefs/Input.java
Index: Input.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Input.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Input.java 6 Jul 2003 09:57:36 -0000 1.21
+++ Input.java 3 Sep 2003 16:47:17 -0000 1.22
@@ -121,6 +121,7 @@
/**
* Set a multiline message.
+ * @param msg The message to be displayed.
*/
public void addText(String msg) {
message += getProject().replaceProperties(msg);
@@ -133,8 +134,8 @@
}
/**
- * Actual method executed by jakarta-ant.
- * @exception BuildException
+ * Actual method executed by ant.
+ * @throws BuildException
*/
public void execute () throws BuildException {
if (addproperty != null
@@ -163,4 +164,4 @@
}
}
-}
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org