-
Notifications
You must be signed in to change notification settings - Fork 877
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes several issues with the editor annotation options.
- Make sure the current editor annotation profile is correctly copied on profile duplication. - Make sure annotation profile settings are correctly persisted and applied on change - All profiles must have annotation color configs to have inherited values work correctly (added missing) - EditorSettings: fix javadoc since the impl never returned null in the last 20 years.
- Loading branch information
Showing
12 changed files
with
561 additions
and
164 deletions.
There are no files selected for viewing
122 changes: 122 additions & 0 deletions
122
ide/defaults/src/org/netbeans/modules/defaults/CityLights-annotations.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| Licensed to the Apache Software Foundation (ASF) under one | ||
| or more contributor license agreements. See the NOTICE file | ||
| distributed with this work for additional information | ||
| regarding copyright ownership. The ASF licenses this file | ||
| to you under the Apache License, Version 2.0 (the | ||
| "License"); you may not use this file except in compliance | ||
| with the License. You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, | ||
| software distributed under the License is distributed on an | ||
| "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| KIND, either express or implied. See the License for the | ||
| specific language governing permissions and limitations | ||
| under the License. | ||
| --> | ||
| <!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd"> | ||
|
|
||
| <fontscolors> | ||
| <fontcolor bgColor="ffdcdcd8" name="OtherThreads_DBP"/> | ||
| <fontcolor bgColor="fffc9d9f" name="Breakpoint"/> | ||
| <fontcolor name="FieldBreakpoint_stroke"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="DisabledBreakpoint"/> | ||
| <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_err_fixable"/> | ||
| <fontcolor bgColor="ffbde6aa" name="CurrentPCLinePart"/> | ||
| <fontcolor name="org-netbeans-modules-editor-annotations-implements-has-implementations-combined"/> | ||
| <fontcolor bgColor="ffe9ffe6" name="CurrentExpressionLine_DBP"/> | ||
| <fontcolor name="org-netbeans-modules-git-Annotation"/> | ||
| <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_err"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="debugger-multi_DBPCBP"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="Breakpoint_broken"/> | ||
| <fontcolor name="DisabledMethodBreakpoint"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_mixedBP"/> | ||
| <fontcolor bgColor="ffbde6aa" name="OtherThreads_PC_BP"/> | ||
| <fontcolor bgColor="ffbde6aa" name="CurrentPC2"/> | ||
| <fontcolor bgColor="ffbde6aa" name="OtherThreads_BP_broken"/> | ||
| <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_warn"/> | ||
| <fontcolor name="ClassBreakpoint"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_BP_stroke"/> | ||
| <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_todo"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="DisabledBreakpoint_stroke"/> | ||
| <fontcolor bgColor="ffb4e4fc" name="loadgenProfilingPoint"/> | ||
| <fontcolor bgColor="fffc9d9f" name="debugger-mixed_BP"/> | ||
| <fontcolor name="DisabledMethodBreakpoint_stroke"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_DCBP"/> | ||
| <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_warn_fixable"/> | ||
| <fontcolor bgColor="ffe7e1ef" name="CallSite"/> | ||
| <fontcolor bgColor="ffbde6aa" name="OtherThread_PC"/> | ||
| <fontcolor bgColor="ffbde6aa" name="CurrentPC"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_multi_BPCBP"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_CBP"/> | ||
| <fontcolor name="DisabledFieldBreakpoint_stroke"/> | ||
| <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_verifier"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_DBP_stroke"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_multi_DBPCBP"/> | ||
| <fontcolor name="org-netbeans-modules-editor-annotations-override-is-overridden-combined"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_multi_BPCBP_broken"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="CondBreakpoint_broken"/> | ||
| <fontcolor bgColor="ffb4e4fc" name="resetResultsProfilingPoint"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="Breakpoint_stroke"/> | ||
| <fontcolor bgColor="ffe9ffe6" name="CurrentExpressionLine_BP"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="debugger-mixed_BP_broken"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="CondBreakpoint_stroke"/> | ||
| <fontcolor name="DisabledClassBreakpoint_stroke"/> | ||
| <fontcolor bgColor="fffc9d9f" name="OtherThreads_BP"/> | ||
| <fontcolor name="org-netbeans-modules-subversion-Annotation"/> | ||
| <fontcolor name="OtherThread"/> | ||
| <fontcolor bgColor="ffe9ffe6" name="CurrentExpressionLine_DCBP"/> | ||
| <fontcolor name="editor-bookmark"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_BP_broken"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="DisabledCondBreakpoint"/> | ||
| <fontcolor bgColor="ffb4e4fc" name="stopwatchProfilingPoint"/> | ||
| <fontcolor name="ClassBreakpoint_stroke"/> | ||
| <fontcolor bgColor="ffe9ffe6" name="CurrentExpressionLine_CBP"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_mixedBP_broken"/> | ||
| <fontcolor name="DisabledFieldBreakpoint"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="loadgenProfilingPointD"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="debugger-multi_BPCBP_broken"/> | ||
| <fontcolor bgColor="fffc9d9f" name="debugger-multi_BPCBP"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_BP"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="DisabledCondBreakpoint_stroke"/> | ||
| <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_hint_fixable"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="OtherThread_DBP"/> | ||
| <fontcolor name="FieldBreakpoint"/> | ||
| <fontcolor name="org-netbeans-modules-editor-annotations-implements-is-overridden-combined"/> | ||
| <fontcolor bgColor="ffb4e4fc" name="takeSnapshotProfilingPoint"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_DCBP_stroke"/> | ||
| <fontcolor name="DisabledClassBreakpoint"/> | ||
| <fontcolor bgColor="ffbde6aa" name="OtherThread_BP_broken"/> | ||
| <fontcolor name="org-netbeans-modules-editor-annotations-is_overridden"/> | ||
| <fontcolor name="org-netbeans-modules-editor-annotations-overrides"/> | ||
| <fontcolor bgColor="ffe9ffe6" name="CurrentExpressionLine"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="CurrentPC2_DBP"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="resetResultsProfilingPointD"/> | ||
| <fontcolor name="MethodBreakpoint_stroke"/> | ||
| <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_verifier_fixable"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_CBP_stroke"/> | ||
| <fontcolor name="org-netbeans-modules-mercurial-Annotation"/> | ||
| <fontcolor bgColor="ffbde6aa" name="CurrentPC2LinePart"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="takeSnapshotProfilingPointD"/> | ||
| <fontcolor bgColor="fffc9d9f" name="OtherThread_BP"/> | ||
| <fontcolor name="org-netbeans-modules-versioning-annotate-Annotation"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_CBP_broken"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="stopwatchProfilingPointD"/> | ||
| <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_hint"/> | ||
| <fontcolor name="MethodBreakpoint"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_DBP"/> | ||
| <fontcolor bgColor="fffc9d9f" name="CondBreakpoint"/> | ||
| <fontcolor bgColor="fffc9d9f" name="CurrentPC2_BP"/> | ||
| <fontcolor name="org-netbeans-modules-editor-annotations-has_implementations"/> | ||
| <fontcolor bgColor="ffbde6aa" name="OtherThread_PC_BP"/> | ||
| <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_todo_fixable"/> | ||
| <fontcolor bgColor="ffffa0a0" name="org-netbeans-modules-xml-error"/> | ||
| <fontcolor name="OtherThreads"/> | ||
| <fontcolor name="org-netbeans-modules-editor-annotations-implements"/> | ||
| <fontcolor bgColor="ffd1ffbc" name="CurrentExpression"/> | ||
| </fontscolors> |
122 changes: 122 additions & 0 deletions
122
ide/defaults/src/org/netbeans/modules/defaults/NetBeans55-annotations.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| Licensed to the Apache Software Foundation (ASF) under one | ||
| or more contributor license agreements. See the NOTICE file | ||
| distributed with this work for additional information | ||
| regarding copyright ownership. The ASF licenses this file | ||
| to you under the Apache License, Version 2.0 (the | ||
| "License"); you may not use this file except in compliance | ||
| with the License. You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, | ||
| software distributed under the License is distributed on an | ||
| "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| KIND, either express or implied. See the License for the | ||
| specific language governing permissions and limitations | ||
| under the License. | ||
| --> | ||
| <!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd"> | ||
|
|
||
| <fontscolors> | ||
| <fontcolor bgColor="ffdcdcd8" name="OtherThreads_DBP"/> | ||
| <fontcolor bgColor="fffc9d9f" name="Breakpoint"/> | ||
| <fontcolor name="FieldBreakpoint_stroke"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="DisabledBreakpoint"/> | ||
| <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_err_fixable"/> | ||
| <fontcolor bgColor="ffbde6aa" name="CurrentPCLinePart"/> | ||
| <fontcolor name="org-netbeans-modules-editor-annotations-implements-has-implementations-combined"/> | ||
| <fontcolor bgColor="ffe9ffe6" name="CurrentExpressionLine_DBP"/> | ||
| <fontcolor name="org-netbeans-modules-git-Annotation"/> | ||
| <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_err"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="debugger-multi_DBPCBP"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="Breakpoint_broken"/> | ||
| <fontcolor name="DisabledMethodBreakpoint"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_mixedBP"/> | ||
| <fontcolor bgColor="ffbde6aa" name="OtherThreads_PC_BP"/> | ||
| <fontcolor bgColor="ffbde6aa" name="CurrentPC2"/> | ||
| <fontcolor bgColor="ffbde6aa" name="OtherThreads_BP_broken"/> | ||
| <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_warn"/> | ||
| <fontcolor name="ClassBreakpoint"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_BP_stroke"/> | ||
| <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_todo"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="DisabledBreakpoint_stroke"/> | ||
| <fontcolor bgColor="ffb4e4fc" name="loadgenProfilingPoint"/> | ||
| <fontcolor bgColor="fffc9d9f" name="debugger-mixed_BP"/> | ||
| <fontcolor name="DisabledMethodBreakpoint_stroke"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_DCBP"/> | ||
| <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_warn_fixable"/> | ||
| <fontcolor bgColor="ffe7e1ef" name="CallSite"/> | ||
| <fontcolor bgColor="ffbde6aa" name="OtherThread_PC"/> | ||
| <fontcolor bgColor="ffbde6aa" name="CurrentPC"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_multi_BPCBP"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_CBP"/> | ||
| <fontcolor name="DisabledFieldBreakpoint_stroke"/> | ||
| <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_verifier"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_DBP_stroke"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_multi_DBPCBP"/> | ||
| <fontcolor name="org-netbeans-modules-editor-annotations-override-is-overridden-combined"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_multi_BPCBP_broken"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="CondBreakpoint_broken"/> | ||
| <fontcolor bgColor="ffb4e4fc" name="resetResultsProfilingPoint"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="Breakpoint_stroke"/> | ||
| <fontcolor bgColor="ffe9ffe6" name="CurrentExpressionLine_BP"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="debugger-mixed_BP_broken"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="CondBreakpoint_stroke"/> | ||
| <fontcolor name="DisabledClassBreakpoint_stroke"/> | ||
| <fontcolor bgColor="fffc9d9f" name="OtherThreads_BP"/> | ||
| <fontcolor name="org-netbeans-modules-subversion-Annotation"/> | ||
| <fontcolor name="OtherThread"/> | ||
| <fontcolor bgColor="ffe9ffe6" name="CurrentExpressionLine_DCBP"/> | ||
| <fontcolor name="editor-bookmark"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_BP_broken"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="DisabledCondBreakpoint"/> | ||
| <fontcolor bgColor="ffb4e4fc" name="stopwatchProfilingPoint"/> | ||
| <fontcolor name="ClassBreakpoint_stroke"/> | ||
| <fontcolor bgColor="ffe9ffe6" name="CurrentExpressionLine_CBP"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_mixedBP_broken"/> | ||
| <fontcolor name="DisabledFieldBreakpoint"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="loadgenProfilingPointD"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="debugger-multi_BPCBP_broken"/> | ||
| <fontcolor bgColor="fffc9d9f" name="debugger-multi_BPCBP"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_BP"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="DisabledCondBreakpoint_stroke"/> | ||
| <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_hint_fixable"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="OtherThread_DBP"/> | ||
| <fontcolor name="FieldBreakpoint"/> | ||
| <fontcolor name="org-netbeans-modules-editor-annotations-implements-is-overridden-combined"/> | ||
| <fontcolor bgColor="ffb4e4fc" name="takeSnapshotProfilingPoint"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_DCBP_stroke"/> | ||
| <fontcolor name="DisabledClassBreakpoint"/> | ||
| <fontcolor bgColor="ffbde6aa" name="OtherThread_BP_broken"/> | ||
| <fontcolor name="org-netbeans-modules-editor-annotations-is_overridden"/> | ||
| <fontcolor name="org-netbeans-modules-editor-annotations-overrides"/> | ||
| <fontcolor bgColor="ffe9ffe6" name="CurrentExpressionLine"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="CurrentPC2_DBP"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="resetResultsProfilingPointD"/> | ||
| <fontcolor name="MethodBreakpoint_stroke"/> | ||
| <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_verifier_fixable"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_CBP_stroke"/> | ||
| <fontcolor name="org-netbeans-modules-mercurial-Annotation"/> | ||
| <fontcolor bgColor="ffbde6aa" name="CurrentPC2LinePart"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="takeSnapshotProfilingPointD"/> | ||
| <fontcolor bgColor="fffc9d9f" name="OtherThread_BP"/> | ||
| <fontcolor name="org-netbeans-modules-versioning-annotate-Annotation"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_CBP_broken"/> | ||
| <fontcolor bgColor="ffdcdcd8" name="stopwatchProfilingPointD"/> | ||
| <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_hint"/> | ||
| <fontcolor name="MethodBreakpoint"/> | ||
| <fontcolor bgColor="ffbde6aa" name="debugger-PC_DBP"/> | ||
| <fontcolor bgColor="fffc9d9f" name="CondBreakpoint"/> | ||
| <fontcolor bgColor="fffc9d9f" name="CurrentPC2_BP"/> | ||
| <fontcolor name="org-netbeans-modules-editor-annotations-has_implementations"/> | ||
| <fontcolor bgColor="ffbde6aa" name="OtherThread_PC_BP"/> | ||
| <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_todo_fixable"/> | ||
| <fontcolor bgColor="ffffa0a0" name="org-netbeans-modules-xml-error"/> | ||
| <fontcolor name="OtherThreads"/> | ||
| <fontcolor name="org-netbeans-modules-editor-annotations-implements"/> | ||
| <fontcolor bgColor="ffd1ffbc" name="CurrentExpression"/> | ||
| </fontscolors> |
Oops, something went wrong.