Author: olamy
Date: Wed Aug 20 15:54:52 2008
New Revision: 687495
URL: http://svn.apache.org/viewvc?rev=687495&view=rev
Log:
fix checkstyle issues
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssConstants.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssParameterContext.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java?rev=687495&r1=687494&r2=687495&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java
Wed Aug 20 15:54:52 2008
@@ -43,7 +43,7 @@
* @version $Id$
*/
public class VssCommandLineUtils
- implements VssConstants // FIXME extend CommandLineUtils
+ // FIXME extend CommandLineUtils
{
private static File scmConfDir = new File( System.getProperty( "user.home"
), ".scm" );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssConstants.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssConstants.java?rev=687495&r1=687494&r2=687495&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssConstants.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssConstants.java
Wed Aug 20 15:54:52 2008
@@ -24,171 +24,171 @@
*
* @version $Id$
*/
-public interface VssConstants
+public class VssConstants
{
/**
* Constant for the thing to execute
*/
- String SS_EXE = "ss";
+ public static final String SS_EXE = "ss";
/**
* Dollar Sigh to prefix the project path
*/
- String PROJECT_PREFIX = "$";
+ public static final String PROJECT_PREFIX = "$";
/**
* The 'CP' command
*/
- String COMMAND_CP = "CP";
+ public static final String COMMAND_CP = "CP";
/**
* The 'Add' command
*/
- String COMMAND_ADD = "Add";
+ public static final String COMMAND_ADD = "Add";
/**
* The 'Get' command
*/
- String COMMAND_GET = "Get";
+ public static final String COMMAND_GET = "Get";
/**
* The 'Checkout' command
*/
- String COMMAND_CHECKOUT = "Checkout";
+ public static final String COMMAND_CHECKOUT = "Checkout";
/**
* The 'Checkin' command
*/
- String COMMAND_CHECKIN = "Checkin";
+ public static final String COMMAND_CHECKIN = "Checkin";
/**
* The 'Label' command
*/
- String COMMAND_LABEL = "Label";
+ public static final String COMMAND_LABEL = "Label";
/**
* The 'History' command
*/
- String COMMAND_HISTORY = "History";
+ public static final String COMMAND_HISTORY = "History";
/**
* The 'Create' command
*/
- String COMMAND_CREATE = "Create";
+ public static final String COMMAND_CREATE = "Create";
/**
* The 'Status' command
*/
- String COMMAND_DIFF = "Diff";
+ public static final String COMMAND_DIFF = "Diff";
/**
* The 'Status' command
*/
- String COMMAND_STATUS = "Status";
+ public static final String COMMAND_STATUS = "Status";
/**
* The brief style flag
*/
- String STYLE_BRIEF = "brief";
+ public static final String STYLE_BRIEF = "brief";
/**
* The codediff style flag
*/
- String STYLE_CODEDIFF = "codediff";
+ public static final String STYLE_CODEDIFF = "codediff";
/**
* The nofile style flag
*/
- String STYLE_NOFILE = "nofile";
+ public static final String STYLE_NOFILE = "nofile";
/**
* The default style flag
*/
- String STYLE_DEFAULT = "default";
+ public static final String STYLE_DEFAULT = "default";
/**
* The text for current (default) timestamp
*/
- String TIME_CURRENT = "current";
+ public static final String TIME_CURRENT = "current";
/**
* The text for modified timestamp
*/
- String TIME_MODIFIED = "modified";
+ public static final String TIME_MODIFIED = "modified";
/**
* The text for updated timestamp
*/
- String TIME_UPDATED = "updated";
+ public static final String TIME_UPDATED = "updated";
/**
* The text for replacing writable files
*/
- String WRITABLE_REPLACE = "replace";
+ public static final String WRITABLE_REPLACE = "replace";
/**
* The text for skiping writable files
*/
- String WRITABLE_SKIP = "skip";
+ public static final String WRITABLE_SKIP = "skip";
/**
* The text for failing on writable files
*/
- String WRITABLE_FAIL = "fail";
+ public static final String WRITABLE_FAIL = "fail";
- String FLAG_LOGIN = "-Y";
+ public static final String FLAG_LOGIN = "-Y";
- String FLAG_OVERRIDE_WORKING_DIR = "-GL";
+ public static final String FLAG_OVERRIDE_WORKING_DIR = "-GL";
- String FLAG_AUTORESPONSE_DEF = "-I-";
+ public static final String FLAG_AUTORESPONSE_DEF = "-I-";
- String FLAG_AUTORESPONSE_YES = "-I-Y";
+ public static final String FLAG_AUTORESPONSE_YES = "-I-Y";
- String FLAG_AUTORESPONSE_NO = "-I-N";
+ public static final String FLAG_AUTORESPONSE_NO = "-I-N";
- String FLAG_RECURSION = "-R";
+ public static final String FLAG_RECURSION = "-R";
- String FLAG_VERSION = "-V";
+ public static final String FLAG_VERSION = "-V";
- String FLAG_VERSION_DATE = "-Vd";
+ public static final String FLAG_VERSION_DATE = "-Vd";
- String FLAG_VERSION_LABEL = "-VL";
+ public static final String FLAG_VERSION_LABEL = "-VL";
- String FLAG_WRITABLE = "-W";
+ public static final String FLAG_WRITABLE = "-W";
- String VALUE_NO = "-N";
+ public static final String VALUE_NO = "-N";
- String VALUE_YES = "-Y";
+ public static final String VALUE_YES = "-Y";
- String FLAG_QUIET = "-O-";
+ public static final String FLAG_QUIET = "-O-";
- String FLAG_COMMENT = "-C";
+ public static final String FLAG_COMMENT = "-C";
- String FLAG_LABEL = "-L";
+ public static final String FLAG_LABEL = "-L";
- String VALUE_FROMDATE = "~d";
+ public static final String VALUE_FROMDATE = "~d";
- String VALUE_FROMLABEL = "~L";
+ public static final String VALUE_FROMLABEL = "~L";
- String FLAG_OUTPUT = "-O";
+ public static final String FLAG_OUTPUT = "-O";
- String FLAG_USER = "-U";
+ public static final String FLAG_USER = "-U";
- String FLAG_NO_FILE = "-F-";
+ public static final String FLAG_NO_FILE = "-F-";
- String FLAG_BRIEF = "-B";
+ public static final String FLAG_BRIEF = "-B";
- String FLAG_CODEDIFF = "-D";
+ public static final String FLAG_CODEDIFF = "-D";
- String FLAG_FILETIME_DEF = "-GTC";
+ public static final String FLAG_FILETIME_DEF = "-GTC";
- String FLAG_FILETIME_MODIFIED = "-GTM";
+ public static final String FLAG_FILETIME_MODIFIED = "-GTM";
- String FLAG_FILETIME_UPDATED = "-GTU";
+ public static final String FLAG_FILETIME_UPDATED = "-GTU";
- String FLAG_REPLACE_WRITABLE = "-GWR";
+ public static final String FLAG_REPLACE_WRITABLE = "-GWR";
- String FLAG_SKIP_WRITABLE = "-GWS";
+ public static final String FLAG_SKIP_WRITABLE = "-GWS";
- String FLAG_NO_GET = "-G-";
+ public static final String FLAG_NO_GET = "-G-";
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssParameterContext.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssParameterContext.java?rev=687495&r1=687494&r2=687495&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssParameterContext.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssParameterContext.java
Wed Aug 20 15:54:52 2008
@@ -35,7 +35,6 @@
* @version $Id$
*/
public class VssParameterContext
- implements VssConstants
{
private String vssPath = null;
@@ -125,7 +124,7 @@
*/
public String getGetLocalCopy()
{
- return ( !getLocalCopy ) ? FLAG_NO_GET : "";
+ return ( !getLocalCopy ) ? VssConstants.FLAG_NO_GET : "";
}
/**
@@ -190,7 +189,7 @@
}
// getLogger().info("Created dir: " + dir.getAbsolutePath());
}
- lclPath = FLAG_OVERRIDE_WORKING_DIR + localPath;
+ lclPath = VssConstants.FLAG_OVERRIDE_WORKING_DIR + localPath;
}
return lclPath;
}
@@ -205,7 +204,7 @@
String shortLabel = "";
if ( label != null && label.length() > 0 )
{
- shortLabel = FLAG_LABEL + getShortLabel();
+ shortLabel = VssConstants.FLAG_LABEL + getShortLabel();
}
return shortLabel;
}
@@ -221,11 +220,11 @@
String versionDateLabel = "";
if ( version != null )
{
- versionDateLabel = FLAG_VERSION + version;
+ versionDateLabel = VssConstants.FLAG_VERSION + version;
}
else if ( date != null )
{
- versionDateLabel = FLAG_VERSION_DATE + date;
+ versionDateLabel = VssConstants.FLAG_VERSION_DATE + date;
}
else
{
@@ -234,7 +233,7 @@
String shortLabel = getShortLabel();
if ( shortLabel != null && !shortLabel.equals( "" ) )
{
- versionDateLabel = FLAG_VERSION_LABEL + shortLabel;
+ versionDateLabel = VssConstants.FLAG_VERSION_LABEL +
shortLabel;
}
}
return versionDateLabel;
@@ -247,7 +246,7 @@
*/
public String getVersion()
{
- return version != null ? FLAG_VERSION + version : "";
+ return version != null ? VssConstants.FLAG_VERSION + version : "";
}
/**
@@ -290,7 +289,7 @@
*/
public String getRecursive()
{
- return recursive ? FLAG_RECURSION : "";
+ return recursive ? VssConstants.FLAG_RECURSION : "";
}
/**
@@ -300,7 +299,7 @@
*/
public String getWritable()
{
- return writable ? FLAG_WRITABLE : "";
+ return writable ? VssConstants.FLAG_WRITABLE : "";
}
/**
@@ -310,7 +309,7 @@
*/
public String getQuiet()
{
- return quiet ? FLAG_QUIET : "";
+ return quiet ? VssConstants.FLAG_QUIET : "";
}
public String getVersionLabel()
@@ -335,7 +334,7 @@
// "ToLabel is longer than 31 characters, truncated to:
"
// + toLabel);
}
- return FLAG_VERSION_LABEL + toLabel + VALUE_FROMLABEL + fromLabel;
+ return VssConstants.FLAG_VERSION_LABEL + toLabel +
VssConstants.VALUE_FROMLABEL + fromLabel;
}
else if ( fromLabel != null )
{
@@ -346,7 +345,7 @@
// "FromLabel is longer than 31 characters, truncated
to: "
// + fromLabel);
}
- return FLAG_VERSION + VALUE_FROMLABEL + fromLabel;
+ return VssConstants.FLAG_VERSION + VssConstants.VALUE_FROMLABEL +
fromLabel;
}
else
{
@@ -357,7 +356,7 @@
// "ToLabel is longer than 31 characters, truncated to:
"
// + toLabel);
}
- return FLAG_VERSION_LABEL + toLabel;
+ return VssConstants.FLAG_VERSION_LABEL + toLabel;
}
}
@@ -368,7 +367,7 @@
*/
public String getUser()
{
- return user != null ? FLAG_USER + user : "";
+ return user != null ? VssConstants.FLAG_USER + user : "";
}
/**
@@ -378,7 +377,7 @@
*/
public String getComment()
{
- return comment != null ? FLAG_COMMENT + comment : FLAG_COMMENT + "-";
+ return comment != null ? VssConstants.FLAG_COMMENT + comment :
VssConstants.FLAG_COMMENT + "-";
}
/**
@@ -389,7 +388,7 @@
*/
public String getLogin()
{
- return vssLogin != null ? ( FLAG_LOGIN + vssLogin ) : "";
+ return vssLogin != null ? ( VssConstants.FLAG_LOGIN + vssLogin ) : "";
}
/**
@@ -401,19 +400,19 @@
{
if ( autoResponse == null )
{
- return FLAG_AUTORESPONSE_DEF;
+ return VssConstants.FLAG_AUTORESPONSE_DEF;
}
else if ( autoResponse.equalsIgnoreCase( "Y" ) )
{
- return FLAG_AUTORESPONSE_YES;
+ return VssConstants.FLAG_AUTORESPONSE_YES;
}
else if ( autoResponse.equalsIgnoreCase( "N" ) )
{
- return FLAG_AUTORESPONSE_NO;
+ return VssConstants.FLAG_AUTORESPONSE_NO;
}
else
{
- return FLAG_AUTORESPONSE_DEF;
+ return VssConstants.FLAG_AUTORESPONSE_DEF;
}
}
@@ -426,9 +425,9 @@
{
if ( ssDir == null )
{
- return SS_EXE;
+ return VssConstants.SS_EXE;
}
- return ssDir.endsWith( File.separator ) ? ssDir + SS_EXE : ssDir +
File.separator + SS_EXE;
+ return ssDir.endsWith( File.separator ) ? ssDir + VssConstants.SS_EXE
: ssDir + File.separator + VssConstants.SS_EXE;
}
public String getVssPath()
@@ -452,13 +451,13 @@
}
if ( fromDate != null && toDate != null )
{
- return FLAG_VERSION_DATE + toDate + VALUE_FROMDATE + fromDate;
+ return VssConstants.FLAG_VERSION_DATE + toDate +
VssConstants.VALUE_FROMDATE + fromDate;
}
else if ( toDate != null && numDays != Integer.MIN_VALUE )
{
try
{
- return FLAG_VERSION_DATE + toDate + VALUE_FROMDATE + calcDate(
toDate, numDays );
+ return VssConstants.FLAG_VERSION_DATE + toDate +
VssConstants.VALUE_FROMDATE + calcDate( toDate, numDays );
}
catch ( ParseException ex )
{
@@ -470,7 +469,7 @@
{
try
{
- return FLAG_VERSION_DATE + calcDate( fromDate, numDays ) +
VALUE_FROMDATE + fromDate;
+ return VssConstants.FLAG_VERSION_DATE + calcDate( fromDate,
numDays ) + VssConstants.VALUE_FROMDATE + fromDate;
}
catch ( ParseException ex )
{
@@ -480,7 +479,7 @@
}
else
{
- return fromDate != null ? FLAG_VERSION + VALUE_FROMDATE + fromDate
: FLAG_VERSION_DATE + toDate;
+ return fromDate != null ? VssConstants.FLAG_VERSION +
VssConstants.VALUE_FROMDATE + fromDate : VssConstants.FLAG_VERSION_DATE +
toDate;
}
}
@@ -491,7 +490,7 @@
*/
public String getOutput()
{
- return outputFileName != null ? FLAG_OUTPUT + outputFileName : "";
+ return outputFileName != null ? VssConstants.FLAG_OUTPUT +
outputFileName : "";
}
/**
