Author: olamy
Date: Wed Aug 20 14:16:51 2008
New Revision: 687470
URL: http://svn.apache.org/viewvc?rev=687470&view=rev
Log:
fix checkstyle issues
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsConnection.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsLogListener.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsConnection.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsConnection.java?rev=687470&r1=687469&r2=687470&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsConnection.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsConnection.java
Wed Aug 20 14:16:51 2008
@@ -114,25 +114,26 @@
* Creates the connection and the client and connects.
*/
private void connect( CVSRoot root, String password )
- throws IllegalArgumentException, AuthenticationException,
CommandAbortedException
+ throws AuthenticationException, CommandAbortedException
{
if ( CVSRoot.METHOD_EXT.equals( root.getMethod() ) )
{
- String cvs_rsh = System.getProperty( "maven.scm.cvs.java.cvs_rsh"
);
- if ( cvs_rsh == null )
+ String cvsRsh = System.getProperty( "maven.scm.cvs.java.cvs_rsh" );
+ if ( cvsRsh == null )
{
try
{
- cvs_rsh = CommandLineUtils.getSystemEnvVars().getProperty(
"CVS_RSH" );
+ cvsRsh = CommandLineUtils.getSystemEnvVars().getProperty(
"CVS_RSH" );
}
catch ( IOException e )
{
+ // we assume searching env var can't fail
}
}
- if ( cvs_rsh != null )
+ if ( cvsRsh != null )
{
- if ( cvs_rsh.indexOf( ' ' ) < 0 )
+ if ( cvsRsh.indexOf( ' ' ) < 0 )
{
//cvs_rsh should be 'rsh' or 'ssh'
//Complete the command to use
@@ -142,10 +143,10 @@
username = System.getProperty( "user.name" );
}
- cvs_rsh += " " + username + "@" + root.getHostName() + "
cvs server";
+ cvsRsh += " " + username + "@" + root.getHostName() + "
cvs server";
}
- AbstractConnection conn = new
org.netbeans.lib.cvsclient.connection.ExtConnection( cvs_rsh );
+ AbstractConnection conn = new
org.netbeans.lib.cvsclient.connection.ExtConnection( cvsRsh );
conn.setRepository( root.getRepository() );
connection = conn;
}
@@ -424,9 +425,9 @@
}
catch ( IllegalArgumentException e )
{
- logger.error( "Incorrect format for CVSRoot: " + cvsRoot + "\nThe
correct format is: " +
- "[:method:][[user][:[EMAIL
PROTECTED]:[port]]/path/to/repository" +
- "\nwhere \"method\" is pserver." );
+ logger.error( "Incorrect format for CVSRoot: " + cvsRoot + "\nThe
correct format is: "
+ + "[:method:][[user][:[EMAIL
PROTECTED]:[port]]/path/to/repository"
+ + "\nwhere \"method\" is pserver." );
return false;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsLogListener.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsLogListener.java?rev=687470&r1=687469&r2=687470&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsLogListener.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsLogListener.java
Wed Aug 20 14:16:51 2008
@@ -29,10 +29,13 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Eric Pugh</a>
* @version $Id$
*/
-public class CvsLogListener extends CVSAdapter
+public class CvsLogListener
+ extends CVSAdapter
{
private final StringBuffer taggedLine = new StringBuffer();
+
private StringBuffer stdout = new StringBuffer();
+
private StringBuffer stderr = new StringBuffer();
/**
@@ -42,16 +45,15 @@
*
* [EMAIL PROTECTED]
*/
- public void messageSent(MessageEvent e)
+ public void messageSent( MessageEvent e )
{
String line = e.getMessage();
StringBuffer stream = e.isError() ? stderr : stdout;
- if (e.isTagged())
+ if ( e.isTagged() )
{
- String message =
- MessageEvent.parseTaggedMessage(taggedLine, e.getMessage());
- if (message != null)
+ String message = MessageEvent.parseTaggedMessage( taggedLine,
e.getMessage() );
+ if ( message != null )
{
//stream.println(message);
stream.append( message ).append( "\n" );
