donaldp 02/02/06 05:34:46
Modified: proposal/myrmidon/src/java/org/apache/aut/bzip2
CBZip2InputStream.java
proposal/myrmidon/src/java/org/apache/aut/nativelib/impl
LogOutputStream.java ProcessMonitor.java
proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers
CommandLauncher.java DefaultCommandLauncher.java
Log:
Style touchups
Revision Changes Path
1.4 +12 -6
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/bzip2/CBZip2InputStream.java
Index: CBZip2InputStream.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/bzip2/CBZip2InputStream.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CBZip2InputStream.java 26 Jan 2002 12:15:06 -0000 1.3
+++ CBZip2InputStream.java 6 Feb 2002 13:34:45 -0000 1.4
@@ -175,7 +175,8 @@
m_blockSize100k = newSize100k;
- if( newSize100k == 0 ) {
+ if( newSize100k == 0 )
+ {
return;
}
@@ -303,7 +304,8 @@
{
m_rNToGo = RAND_NUMS[ m_rTPos ];
m_rTPos++;
- if( m_rTPos == 512 ) {
+ if( m_rTPos == 512 )
+ {
m_rTPos = 0;
}
}
@@ -342,7 +344,8 @@
{
m_rNToGo = RAND_NUMS[ m_rTPos ];
m_rTPos++;
- if( m_rTPos == 512 ) {
+ if( m_rTPos == 512 )
+ {
m_rTPos = 0;
}
}
@@ -467,11 +470,14 @@
int N = 1;
do
{
- if( nextSym == RUNA ) {
+ if( nextSym == RUNA )
+ {
s = s + ( 0 + 1 ) * N;
- } else if( nextSym == RUNB ) {
+ }
+ else if( nextSym == RUNB )
+ {
s = s + ( 1 + 1 ) * N;
- }
+ }
N = N * 2;
if( groupPos == 0 )
1.3 +1 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/LogOutputStream.java
Index: LogOutputStream.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/LogOutputStream.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LogOutputStream.java 20 Jan 2002 17:32:59 -0000 1.2
+++ LogOutputStream.java 6 Feb 2002 13:34:46 -0000 1.3
@@ -12,14 +12,13 @@
import java.io.OutputStream;
import org.apache.aut.nativelib.ExecOutputHandler;
-
/**
* Logs each line written to this stream to the specified
* <code>ExecOutputHandler</code>. Tries to be smart about
* line separators.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.2 $ $Date: 2002/01/20 17:32:59 $
+ * @version $Revision: 1.3 $ $Date: 2002/02/06 13:34:46 $
*/
class LogOutputStream
extends OutputStream
1.5 +4 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessMonitor.java
Index: ProcessMonitor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessMonitor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ProcessMonitor.java 26 Jan 2002 04:51:14 -0000 1.4
+++ ProcessMonitor.java 6 Feb 2002 13:34:46 -0000 1.5
@@ -21,7 +21,7 @@
* It will also in the future do the same for stdin.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.4 $ $Date: 2002/01/26 04:51:14 $
+ * @version $Revision: 1.5 $ $Date: 2002/02/06 13:34:46 $
*/
class ProcessMonitor
extends AbstractLogEnabled
@@ -256,8 +256,9 @@
try
{
final int available = input.available();
- if( 0 >= available ) {
- return;
+ if( 0 >= available )
+ {
+ return;
}
final byte[] data = new byte[ available ];
1.2 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/CommandLauncher.java
Index: CommandLauncher.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/CommandLauncher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CommandLauncher.java 2 Feb 2002 05:10:36 -0000 1.1
+++ CommandLauncher.java 6 Feb 2002 13:34:46 -0000 1.2
@@ -8,8 +8,8 @@
package org.apache.aut.nativelib.impl.launchers;
import java.io.IOException;
-import org.apache.aut.nativelib.ExecMetaData;
import org.apache.aut.nativelib.ExecException;
+import org.apache.aut.nativelib.ExecMetaData;
/**
* This is the interface implemented by objects which are capable of
@@ -20,7 +20,7 @@
* <code>CommandLauncher</code> most appropriate for their environment.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.1 $ $Date: 2002/02/02 05:10:36 $
+ * @version $Revision: 1.2 $ $Date: 2002/02/06 13:34:46 $
*/
public interface CommandLauncher
{
1.3 +3 -5
jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java
Index: DefaultCommandLauncher.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultCommandLauncher.java 2 Feb 2002 05:10:36 -0000 1.2
+++ DefaultCommandLauncher.java 6 Feb 2002 13:34:46 -0000 1.3
@@ -11,12 +11,10 @@
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-
-import org.apache.avalon.excalibur.i18n.ResourceManager;
-import org.apache.avalon.excalibur.i18n.Resources;
-
import org.apache.aut.nativelib.ExecException;
import org.apache.aut.nativelib.ExecMetaData;
+import org.apache.avalon.excalibur.i18n.ResourceManager;
+import org.apache.avalon.excalibur.i18n.Resources;
/**
* A command launcher for a particular JVM/OS platform. This class is a
@@ -25,7 +23,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Thomas Haas</a>
- * @version $Revision: 1.2 $ $Date: 2002/02/02 05:10:36 $
+ * @version $Revision: 1.3 $ $Date: 2002/02/06 13:34:46 $
*/
public class DefaultCommandLauncher
implements CommandLauncher
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
