Author: peterreilly
Date: Fri Sep 28 06:35:41 2007
New Revision: 580348
URL: http://svn.apache.org/viewvc?rev=580348&view=rev
Log:
checkstyle: remove inner assignment
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java?rev=580348&r1=580347&r2=580348&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
Fri Sep 28 06:35:41 2007
@@ -260,8 +260,11 @@
}
private String parseCharSetFromMimeType(String type) {
- int pos;
- if (type == null || (pos = type.indexOf("charset")) < 0) {
+ if (type == null) {
+ return null;
+ }
+ int pos = type.indexOf("charset");
+ if (pos < 0) {
return null;
}
// Assuming mime type in form "text/XXXX; charset=XXXXXX"
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java?rev=580348&r1=580347&r2=580348&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
Fri Sep 28 06:35:41 2007
@@ -153,7 +153,7 @@
args[j++] = destinationDirectory.getAbsolutePath().trim();
args[j++] = "-docroot";
args[j++] = sourceDirectory.getAbsolutePath().trim();
- args[j++] = "-keepgenerated"; //TODO: Parameterise ??
+ args[j++] = "-keepgenerated";
//Call compiler as class... dont want to fork again
//Use classic compiler -- can be parameterised?
args[j++] = "-compilerclass";
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
