This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 6261327 [NETBEANS-3700] No more harcoding for Code Coverage
Highlights.
6261327 is described below
commit 6261327d920d772b65255ce2de0fd4e92d7cf04d
Author: Laszlo Kishalmi <[email protected]>
AuthorDate: Wed Jan 15 18:05:13 2020 -0800
[NETBEANS-3700] No more harcoding for Code Coverage Highlights.
---
.../netbeans/modules/defaults/BlueTheme-editor.xml | 5 +++++
.../modules/gsf/codecoverage/Bundle.properties | 6 ++++++
.../gsf/codecoverage/CoverageHighlightsContainer.java | 15 ++++++++++-----
.../gsf/codecoverage/{layer.xml => fontsColors.xml} | 19 +++++++++----------
.../org/netbeans/modules/gsf/codecoverage/layer.xml | 12 ++++++++++++
.../flatlaf/fontscolors/FlatLafDark-highlights.xml | 4 ++++
6 files changed, 46 insertions(+), 15 deletions(-)
diff --git
a/ide/defaults/src/org/netbeans/modules/defaults/BlueTheme-editor.xml
b/ide/defaults/src/org/netbeans/modules/defaults/BlueTheme-editor.xml
index 78d40f8..7ebf930 100644
--- a/ide/defaults/src/org/netbeans/modules/defaults/BlueTheme-editor.xml
+++ b/ide/defaults/src/org/netbeans/modules/defaults/BlueTheme-editor.xml
@@ -62,4 +62,9 @@
<fontcolor name="LastOperation" bgColor="6f9f5a"/>
<fontcolor name="StepOutOperation" bgColor="2D6035"/>
+ <fontcolor name="coverage-covered" bgColor="0F4F40"/>
+ <fontcolor name="coverage-uncovered" bgColor="4F0F40"/>
+ <fontcolor name="coverage-inferred" bgColor="1F4F40"/>
+ <fontcolor name="coverage-partial" bgColor="909040"/>
+
</fontscolors>
diff --git
a/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/Bundle.properties
b/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/Bundle.properties
index b405ccc..827a558 100644
---
a/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/Bundle.properties
+++
b/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/Bundle.properties
@@ -51,3 +51,9 @@ CoverageReportTopComponent.allTestsButton.text=Run Al&l Tests
CoverageAction.MenuName=Code Covera&ge
CoverageSideBar.label.toolTipText=Use Ctrl-Shift-F11 to focus
+
+# Coloring names
+coverage-covered=Code Coverage (covered)
+coverage-uncovered=Code Coverage (not covered)
+coverage-inferred=Code Coverage (inferred)
+coverage-partial=Code Coverage (partial)
\ No newline at end of file
diff --git
a/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/CoverageHighlightsContainer.java
b/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/CoverageHighlightsContainer.java
index f949ece..ac110e7 100644
---
a/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/CoverageHighlightsContainer.java
+++
b/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/CoverageHighlightsContainer.java
@@ -70,6 +70,11 @@ public class CoverageHighlightsContainer extends
AbstractHighlightsContainer imp
private FileObject fileObject;
private Project project;
+ private static final String COLORING_COVERED = "coverage-covered";
//NOI18N
+ private static final String COLORING_UNCOVERED = "coverage-uncovered";
//NOI18N
+ private static final String COLORING_INFERRED = "coverage-inferred";
//NOI18N
+ private static final String COLORING_PARTIAL = "coverage-partial";
//NOI18N
+
CoverageHighlightsContainer(JTextComponent component) {
this.component = component;
Document document = component.getDocument();
@@ -118,7 +123,7 @@ public class CoverageHighlightsContainer extends
AbstractHighlightsContainer imp
}
private static Color getColoring(FontColorSettings fcs, String tokenName) {
- AttributeSet as = fcs.getTokenFontColors(tokenName);
+ AttributeSet as = fcs.getFontColors(tokenName);
if (as != null) {
return (Color) as.getAttribute(StyleConstants.Background); //NOI18N
}
@@ -136,10 +141,10 @@ public class CoverageHighlightsContainer extends
AbstractHighlightsContainer imp
Color partialBc = null;
FontColorSettings fcs =
MimeLookup.getLookup(mimeType).lookup(FontColorSettings.class);
if (fcs != null) {
- coveredBc = getColoring(fcs, "covered"); // NOI18N
- uncoveredBc = getColoring(fcs, "uncovered"); // NOI18N
- inferredBc = getColoring(fcs, "inferred"); // NOI18N
- partialBc = getColoring(fcs, "partial"); // NOI18N
+ coveredBc = getColoring(fcs, COLORING_COVERED);
+ uncoveredBc = getColoring(fcs, COLORING_UNCOVERED);
+ inferredBc = getColoring(fcs, COLORING_INFERRED);
+ partialBc = getColoring(fcs, COLORING_PARTIAL);
}
if (coveredBc == null) {
coveredBc = new Color(0xCC, 0xFF, 0xCC);
diff --git
a/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/layer.xml
b/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/fontsColors.xml
similarity index 67%
copy from
ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/layer.xml
copy to
ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/fontsColors.xml
index 19f4d3c..e0cb086d 100644
--- a/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/layer.xml
+++
b/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/fontsColors.xml
@@ -19,13 +19,12 @@
under the License.
-->
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN"
"http://www.netbeans.org/dtds/filesystem-1_2.dtd";>
-<filesystem>
- <folder name="Windows2">
- <folder name="Modes">
- <folder name="editor">
- <file name="CoverageReportTopComponent.wstcref"
url="CoverageReportTopComponentWstcref.xml"/>
- </folder>
- </folder>
- </folder>
-</filesystem>
+<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors
settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd";>
+
+<fontscolors>
+ <fontcolor name="coverage-covered" bgColor="CCFFCC"/>
+ <fontcolor name="coverage-uncovered" bgColor="FFCCCC"/>
+ <fontcolor name="coverage-inferred" bgColor="E0FFE0"/>
+ <fontcolor name="coverage-partial" bgColor="FFFFE0"/>
+</fontscolors>
+
diff --git
a/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/layer.xml
b/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/layer.xml
index 19f4d3c..fb96fe5 100644
--- a/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/layer.xml
+++ b/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/layer.xml
@@ -21,6 +21,18 @@
-->
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN"
"http://www.netbeans.org/dtds/filesystem-1_2.dtd";>
<filesystem>
+ <folder name="Editors">
+ <folder name="FontsColors">
+ <folder name="NetBeans">
+ <folder name="Defaults">
+ <file
name="org-netbeans-modules-gsf-codecoverage-fontsColors.xml"
url="fontsColors.xml">
+ <attr name="SystemFileSystem.localizingBundle"
stringvalue="org.netbeans.modules.gsf.codecoverage.Bundle"/>
+ <attr name="nbeditor-settings-ColoringType"
stringvalue="highlight"/>
+ </file>
+ </folder>
+ </folder>
+ </folder>
+ </folder>
<folder name="Windows2">
<folder name="Modes">
<folder name="editor">
diff --git
a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-highlights.xml
b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-highlights.xml
index 0ef078f..08bde17 100644
---
a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-highlights.xml
+++
b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-highlights.xml
@@ -49,4 +49,8 @@
<fontcolor name="text-limit-line-color" foreColor="ff555555"/>
<fontcolor name="trailing-whitespace"/>
<fontcolor name="west-sidebars-color"/>
+ <fontcolor name="coverage-covered" bgColor="005000"/>
+ <fontcolor name="coverage-uncovered" bgColor="813438"/>
+ <fontcolor name="coverage-inferred" bgColor="1c501c"/>
+ <fontcolor name="coverage-partial" bgColor="707000"/>
</fontscolors>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
