# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: /home/venkat/NetBeansProjects/nb/main-golden # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: maven/src/org/netbeans/modules/maven/execute/AbstractOutputHandler.java --- maven/src/org/netbeans/modules/maven/execute/AbstractOutputHandler.java Base (BASE) +++ maven/src/org/netbeans/modules/maven/execute/AbstractOutputHandler.java Locally Modified (Based On LOCAL) @@ -301,20 +301,24 @@ } if (!visitor.isLineSkipped()) { String line = visitor.getLine() == null ? input : visitor.getLine(); + OutputColors outputColors = new OutputColors(); if (visitor.getColor() == null && visitor.getOutputListener() == null) { switch (level) { case DEBUG: - visitor.setColor(Color.GRAY); + visitor.setColor(outputColors.getDebugColor()); break; case WARNING: - visitor.setColor(Color.ORANGE.darker()); + visitor.setColor(outputColors.getWarningColor()); break; case ERROR: - visitor.setColor(Color.RED); + visitor.setColor(outputColors.getErrorColor()); break; case FATAL: - visitor.setColor(Color.MAGENTA); + visitor.setColor(outputColors.getFatalColor()); break; + case INFO: + visitor.setColor(outputColors.getInfoColor()); + break; } } try { Index: maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java --- maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java Base (BASE) +++ maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java Locally Modified (Based On LOCAL) @@ -461,9 +461,10 @@ } private static void printGray(InputOutput io, String text) { + OutputColors outputColors = new OutputColors(); if (IOColorLines.isSupported(io)) { try { - IOColorLines.println(io, text, Color.GRAY); + IOColorLines.println(io, text, outputColors.getSubduedTextColor()); } catch (IOException ex) { Exceptions.printStackTrace(ex); } Index: maven/src/org/netbeans/modules/maven/execute/OutputColors.java --- maven/src/org/netbeans/modules/maven/execute/OutputColors.java Base (BASE) +++ maven/src/org/netbeans/modules/maven/execute/OutputColors.java Locally New @@ -0,0 +1,142 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2013 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2013 Sun Microsystems, Inc. + */ +package org.netbeans.modules.maven.execute; + +import java.awt.Color; +import javax.swing.UIManager; + +/** + * + * @author venkat + */ +public class OutputColors { + + private Color debugColor; + private Color infoColor; + private Color warningColor; + private Color errorColor; + private Color fatalColor; + private Color subduedTextColor; + + public OutputColors() { + debugColor = (Color) UIManager.getColor("nb.output.debug.foreground"); + if(debugColor == null){ + debugColor = Color.GRAY; + } + + infoColor = (Color) UIManager.getColor("nb.output.info.foreground"); + if(infoColor == null){ + infoColor = Color.BLACK; + } + + warningColor = (Color) UIManager.getColor("nb.output.warning.foreground"); + if(warningColor == null){ + warningColor = Color.ORANGE.darker(); + } + + errorColor = (Color) UIManager.getColor("nb.output.error.foreground"); + if(errorColor == null){ + errorColor = Color.RED; + } + + debugColor = (Color) UIManager.getColor("nb.output.fatal.foreground"); + if(debugColor == null){ + debugColor = Color.MAGENTA; + } + + subduedTextColor = (Color) UIManager.getColor("nb.output.subduedText.foreground"); + if(subduedTextColor == null){ + subduedTextColor = Color.GRAY; + } + + } + + public Color getDebugColor() { + return debugColor; + } + + public void setDebugColor(Color debugColor) { + this.debugColor = debugColor; + } + + public Color getInfoColor() { + return infoColor; + } + + public void setInfoColor(Color infoColor) { + this.infoColor = infoColor; + } + + public Color getWarningColor() { + return warningColor; + } + + public void setWarningColor(Color warningColor) { + this.warningColor = warningColor; + } + + public Color getErrorColor() { + return errorColor; + } + + public void setErrorColor(Color errorColor) { + this.errorColor = errorColor; + } + + public Color getFatalColor() { + return fatalColor; + } + + public void setFatalColor(Color fatalColor) { + this.fatalColor = fatalColor; + } + + public Color getSubduedTextColor() { + return subduedTextColor; + } + + public void setSubduedTextColor(Color subduedTextColor) { + this.subduedTextColor = subduedTextColor; + } + + +} Index: maven/src/org/netbeans/modules/maven/output/GlobalOutputProcessor.java --- maven/src/org/netbeans/modules/maven/output/GlobalOutputProcessor.java Base (BASE) +++ maven/src/org/netbeans/modules/maven/output/GlobalOutputProcessor.java Locally Modified (Based On LOCAL) @@ -53,6 +53,7 @@ import org.netbeans.modules.maven.api.execute.RunConfig; import org.netbeans.modules.maven.api.output.OutputProcessor; import org.netbeans.modules.maven.api.output.OutputVisitor; +import org.netbeans.modules.maven.execute.OutputColors; import org.netbeans.modules.maven.options.MavenOptionController; import static org.netbeans.modules.maven.output.Bundle.*; import org.netbeans.modules.options.java.api.JavaOptions; @@ -209,7 +210,8 @@ // visitor.setLine(sequenceId); } else { visitor.setLine("[" + sequenceId.substring("mojo-execute#".length()) + "]"); //NOI18N - visitor.setColor(Color.GRAY); + OutputColors outputColors = new OutputColors(); + visitor.setColor(outputColors.getSubduedTextColor()); } }