You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tn...@apache.org on 2013/01/29 16:31:06 UTC
svn commit: r1439942 - in
/commons/proper/cli/trunk/src/main/java/org/apache/commons/cli:
GnuParser.java HelpFormatter.java PosixParser.java
Author: tn
Date: Tue Jan 29 15:31:05 2013
New Revision: 1439942
URL: http://svn.apache.org/viewvc?rev=1439942&view=rev
Log:
Add missing @Deprecated annotations, reorder fields due to checkstyle warnings.
Modified:
commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/GnuParser.java
commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/HelpFormatter.java
commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/PosixParser.java
Modified: commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/GnuParser.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/GnuParser.java?rev=1439942&r1=1439941&r2=1439942&view=diff
==============================================================================
--- commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/GnuParser.java (original)
+++ commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/GnuParser.java Tue Jan 29 15:31:05 2013
@@ -28,6 +28,7 @@ import java.util.List;
* @version $Revision$, $Date$
* @deprecated Use the {@link DefaultParser} instead
*/
+@Deprecated
public class GnuParser extends Parser
{
/**
Modified: commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/HelpFormatter.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/HelpFormatter.java?rev=1439942&r1=1439941&r2=1439942&view=diff
==============================================================================
--- commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/HelpFormatter.java (original)
+++ commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/HelpFormatter.java Tue Jan 29 15:31:05 2013
@@ -108,6 +108,7 @@ public class HelpFormatter
* @deprecated Scope will be made private for next major version
* - use get/setWidth methods instead.
*/
+ @Deprecated
public int defaultWidth = DEFAULT_WIDTH;
/**
@@ -116,6 +117,7 @@ public class HelpFormatter
* @deprecated Scope will be made private for next major version
* - use get/setLeftPadding methods instead.
*/
+ @Deprecated
public int defaultLeftPad = DEFAULT_LEFT_PAD;
/**
@@ -125,6 +127,7 @@ public class HelpFormatter
* @deprecated Scope will be made private for next major version
* - use get/setDescPadding methods instead.
*/
+ @Deprecated
public int defaultDescPad = DEFAULT_DESC_PAD;
/**
@@ -133,6 +136,7 @@ public class HelpFormatter
* @deprecated Scope will be made private for next major version
* - use get/setSyntaxPrefix methods instead.
*/
+ @Deprecated
public String defaultSyntaxPrefix = DEFAULT_SYNTAX_PREFIX;
/**
@@ -141,6 +145,7 @@ public class HelpFormatter
* @deprecated Scope will be made private for next major version
* - use get/setNewLine methods instead.
*/
+ @Deprecated
public String defaultNewLine = System.getProperty("line.separator");
/**
@@ -149,6 +154,7 @@ public class HelpFormatter
* @deprecated Scope will be made private for next major version
* - use get/setOptPrefix methods instead.
*/
+ @Deprecated
public String defaultOptPrefix = DEFAULT_OPT_PREFIX;
/**
@@ -157,17 +163,16 @@ public class HelpFormatter
* @deprecated Scope will be made private for next major version
* - use get/setLongOptPrefix methods instead.
*/
+ @Deprecated
public String defaultLongOptPrefix = DEFAULT_LONG_OPT_PREFIX;
- /** The separator displayed between the long option and its value. */
- private String longOptSeparator = DEFAULT_LONG_OPT_SEPARATOR;
-
/**
* the name of the argument
*
* @deprecated Scope will be made private for next major version
* - use get/setArgName methods instead.
*/
+ @Deprecated
public String defaultArgName = DEFAULT_ARG_NAME;
/**
@@ -176,7 +181,10 @@ public class HelpFormatter
* Defaults to case-insensitive alphabetical sorting by option key
*/
protected Comparator<Option> optionComparator = new OptionComparator();
-
+
+ /** The separator displayed between the long option and its value. */
+ private String longOptSeparator = DEFAULT_LONG_OPT_SEPARATOR;
+
/**
* Sets the 'width'.
*
Modified: commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/PosixParser.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/PosixParser.java?rev=1439942&r1=1439941&r2=1439942&view=diff
==============================================================================
--- commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/PosixParser.java (original)
+++ commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/PosixParser.java Tue Jan 29 15:31:05 2013
@@ -30,6 +30,7 @@ import java.util.List;
* @version $Revision$, $Date$
* @deprecated Use the {@link DefaultParser} instead
*/
+@Deprecated
public class PosixParser extends Parser
{
/** holder for flattened tokens */