Author: hboutemy
Date: Sun Jul 17 17:06:27 2016
New Revision: 1753088
URL: http://svn.apache.org/viewvc?rev=1753088&view=rev
Log:
[MSHARED-562] applied updates proposed by Michael
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/Style.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/package-info.java
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java?rev=1753088&r1=1753087&r2=1753088&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
Sun Jul 17 17:06:27 2016
@@ -23,7 +23,7 @@ import org.fusesource.jansi.Ansi;
import org.fusesource.jansi.AnsiConsole;
/**
- * Colored message utils, to manage colors colors consistently across plugins
(only if Maven version is at least 3.4.0).
+ * Colored message utils, to manage colors consistently across plugins (only
if Maven version is at least 3.4.0).
* For Maven version before 3.4.0, message built with this util will never add
color.
* <p>
* Internally, <a href="http://fusesource.github.io/jansi/";>Jansi</a> is used
to render
@@ -60,6 +60,11 @@ public class MessageUtils
}
}
+ /**
+ * Undo a previous {@link #systemInstall()}. If {@link #systemInstall()}
was called
+ * multiple times, {@link #systemUninstall()} must be called call the same
number of times before
+ * it is actually uninstalled.
+ */
public static void systemUninstall()
{
if ( JANSI )
@@ -69,10 +74,10 @@ public class MessageUtils
}
/**
- * Activates message color (if JAnsi is available).
+ * Enables message color (if JAnsi is available).
* @param flag
*/
- public static void setColor( boolean flag )
+ public static void setColorEnabled( boolean flag )
{
if ( JANSI )
{
@@ -81,9 +86,9 @@ public class MessageUtils
}
/**
- * Is message color active: requires JAnsi available (through Maven) and
the color has not been disabled.
+ * Is message color enabled: requires JAnsi available (through Maven) and
the color has not been disabled.
*/
- public static boolean isColor()
+ public static boolean isColorEnabled()
{
return JANSI ? Ansi.isEnabled() : false;
}
@@ -116,11 +121,11 @@ public class MessageUtils
}
/**
- * Remove any ANSI code from a message
+ * Remove any ANSI code from a message (colors or other escape sequences).
* @param msg message eventually containing ANSI codes
* @return the message with ANSI codes removed
*/
- public static String stripAnsi( String msg )
+ public static String stripAnsiCodes( String msg )
{
return msg.replaceAll( "\u001B\\[[;\\d]*[ -/]*[@-~]", "" );
}
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/Style.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/Style.java?rev=1753088&r1=1753087&r2=1753088&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/Style.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/Style.java
Sun Jul 17 17:06:27 2016
@@ -144,7 +144,7 @@ enum Style
{
return name();
}
- StringBuilder sb = new StringBuilder();
+ StringBuilder sb = new StringBuilder( name() + '=' );
if ( bold )
{
sb.append( "bold" );
@@ -174,7 +174,7 @@ enum Style
}
sb.append( bgColor.name() );
}
- return name() + '=' + sb;
+ return sb.toString();
}
}
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/package-info.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/package-info.java?rev=1753088&r1=1753087&r2=1753088&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/package-info.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/package-info.java
Sun Jul 17 17:06:27 2016
@@ -30,8 +30,8 @@
* <p>
* Styles are:<ul>
* <li><code>debug</code>, <code>info</code>, <code>warning</code> and
<code>error</code> for slf4j level display,</li>
- * <li><code>success</code>, <code>failure</code>, <code>strong</code>,
<code>mojo</code> and <code>project</code> for
- * message content</li>
+ * <li><code>success</code>, <code>warning</code>, <code>failure</code>,
<code>strong</code>, <code>mojo</code>
+ * and <code>project</code> for message content</li>
* </ul>
* Default styles colors can be overridden through system properties, that can
be set in <code>MAVEN_OPTS</code>
* environment variable (eventually in <code>.mavenrc</code> script):<ul>
