svn commit: r737688 - /ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/AntUnit.java

[bo...@apache.org]

Author: bodewig
Date: Mon Jan 26 13:16:12 2009
New Revision: 737688

URL: http://svn.apache.org/viewvc?rev=737688&view=rev
Log:
English spelling of actif

Modified:
    ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/AntUnit.java

Modified: ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/AntUnit.java
URL: http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/AntUnit.java?rev=737688&r1=737687&r2=737688&view=diff
==============================================================================
--- ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/AntUnit.java (original)
+++ ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/AntUnit.java Mon Jan 26 13:16:12 2009
@@ -227,8 +227,8 @@
         }
 
         /** Indicates if there is a project currently under test. */
-        public boolean isActif() {
-            return scriptFile!=null;
+        public boolean isActive() {
+            return scriptFile != null;
         }
 
         /**
@@ -237,8 +237,10 @@
          * @pre isActif()
          */
         public Project get() {
-            if (!isActif()) throw new AssertionError("scriptFile==null");
-            if (project==null) {
+            if (!isActive()) {
+                throw new AssertionError("scriptFile==null");
+            }
+            if (project == null) {
                 project = createProjectForFile(scriptFile);
                 projectIsDirty = false;
             }
@@ -247,11 +249,13 @@
         
         /**
          * Get a project that has not yet been used in order to execute a target on it.
-         * @pre isActif()
+         * @pre isActive()
          */
         public Project getRenewed() {
-            if (!isActif()) throw new AssertionError("scriptFile==null");
-            if (project==null || projectIsDirty) {
+            if (!isActive()) {
+                throw new AssertionError("scriptFile==null");
+            }
+            if (project == null || projectIsDirty) {
                 project = createProjectForFile(scriptFile);
             }
             //we already set isDirty to true in order to make sure we didn't reuse
@@ -438,7 +442,7 @@
      * @param outputToHandle the output to handle.
      */
     public void handleOutput(String outputToHandle) {
-        if (currentProject.isActif()) {
+        if (currentProject.isActive()) {
             currentProject.get().demuxOutput(outputToHandle, false);
         } else {
             super.handleOutput(outputToHandle);
@@ -453,7 +457,7 @@
      */
     public int handleInput(byte[] buffer, int offset, int length)
         throws IOException {
-        if (currentProject.isActif()) {
+        if (currentProject.isActive()) {
             return currentProject.get().demuxInput(buffer, offset, length);
         }
         return super.handleInput(buffer, offset, length);
@@ -464,7 +468,7 @@
      * @param toFlush the output String to flush.
      */
     public void handleFlush(String toFlush) {
-        if (currentProject.isActif()) {
+        if (currentProject.isActive()) {
             currentProject.get().demuxFlush(toFlush, false);
         } else {
             super.handleFlush(toFlush);
@@ -476,7 +480,7 @@
      * @param errorOutputToHandle the error output to handle.
      */
     public void handleErrorOutput(String errorOutputToHandle) {
-        if (currentProject.isActif()) {
+        if (currentProject.isActive()) {
             currentProject.get().demuxOutput(errorOutputToHandle, true);
         } else {
             super.handleErrorOutput(errorOutputToHandle);
@@ -488,7 +492,7 @@
      * @param errorOutputToFlush the error output to flush.
      */
     public void handleErrorFlush(String errorOutputToFlush) {
-        if (currentProject.isActif()) {
+        if (currentProject.isActive()) {
             currentProject.get().demuxFlush(errorOutputToFlush, true);
         } else {
             super.handleErrorFlush(errorOutputToFlush);