From 1d71f55f68c7d6810bbd1feaa7ed6ca0c2afaefb Mon Sep 17 00:00:00 2001
From: Peter Reilly <peterreilly@apache.org>
Date: Thu, 27 Sep 2007 11:31:30 +0000
Subject: [PATCH] more inner assignments

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@579978 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java  | 11 ++++++-----
 .../tools/ant/taskdefs/optional/i18n/Translate.java   |  3 ++-
 .../tools/ant/taskdefs/optional/perforce/P4Base.java  |  2 ++
 .../taskdefs/optional/ssh/ScpFromMessageBySftp.java   |  4 ++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
index f7a755662..fa4f0a817 100644
--- a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
+++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
@@ -289,13 +289,14 @@ public class CvsTagDiff extends AbstractCvsTask {
                         line = line.substring(FILE_STRING.length());
                     }
 
-                    if ((index = line.indexOf(FILE_IS_NEW)) != -1) {
+                    index = line.indexOf(FILE_IS_NEW);
+                    if (index  != -1) {
                         // it is a new file
                         // set the revision but not the prevrevision
                         String filename = line.substring(0, index);
                         String rev = null;
-                        int indexrev = -1;
-                        if ((indexrev = line.indexOf(REVISION, index)) != -1) {
+                        int indexrev = line.indexOf(REVISION, index);
+                        if (indexrev != -1) {
                             rev = line.substring(indexrev + REVISION.length());
                         }
                         entry = new CvsTagEntry(filename, rev);
@@ -319,8 +320,8 @@ public class CvsTagDiff extends AbstractCvsTask {
                         // it is a removed file
                         String filename = line.substring(0, index);
                         String rev = null;
-                        int indexrev = -1;
-                        if ((indexrev = line.indexOf(REVISION, index)) != -1) {
+                        int indexrev = line.indexOf(REVISION, index);
+                        if (indexrev != -1) {
                             rev = line.substring(indexrev + REVISION.length());
                         }
                         entry = new CvsTagEntry(filename, null, rev);
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
index 87300dd46..3ca2266a8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
@@ -457,7 +457,8 @@ public class Translate extends MatchingTask {
                         //Handle line continuations, if any
                         while (value.endsWith("\\")) {
                             value = value.substring(0, value.length() - 1);
-                            if ((line = in.readLine()) != null) {
+                            line = in.readLine();
+                            if (line != null) {
                                 value = value + line.trim();
                             } else {
                                 break;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
index 4ee0af85f..62a7512be 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
@@ -211,6 +211,7 @@ public abstract class P4Base extends org.apache.tools.ant.Task {
         //Get default P4 settings from environment - Mark would have done something cool with
         //introspection here.....:-)
         String tmpprop;
+        // CheckStyle:InnerAssignment OFF
         if ((tmpprop = getProject().getProperty("p4.port")) != null) {
             setPort(tmpprop);
         }
@@ -220,6 +221,7 @@ public abstract class P4Base extends org.apache.tools.ant.Task {
         if ((tmpprop = getProject().getProperty("p4.user")) != null) {
             setUser(tmpprop);
         }
+        // CheckStyle:InnerAssignment ON
     }
     /**
     *  no usages found for this method
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java
index e625b9adf..9b54b08a7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java
@@ -140,8 +140,8 @@ public class ScpFromMessageBySftp extends ScpFromMessage {
         String remoteFile = le.getFilename();
         if (!localFile.exists()) {
             String path = localFile.getAbsolutePath();
-            int i = 0;
-            if ((i = path.lastIndexOf(File.pathSeparator)) != -1) {
+            int i = path.lastIndexOf(File.pathSeparator);
+            if (i != -1) {
                 if (path.length() > File.pathSeparator.length()) {
                     new File(path.substring(0, i)).mkdirs();
                 }