This is an automated email from the ASF dual-hosted git repository.
mbien pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 4bc8045e9f0 Merge pull request #8287 from NReib/B8286
add 9809a2e1a51 Fixes several issues with the editor annotation options.
add 371ccec76c6 Merge pull request #8231 from
mbien/fix-anotation-editor-settings
No new revisions were added by this update.
Summary of changes:
.../modules/defaults/CityLights-annotations.xml} | 0
.../modules/defaults/NetBeans55-annotations.xml} | 0
.../defaults/NetBeansEarth-annotations.xml} | 0
.../src/org/netbeans/modules/defaults/mf-layer.xml | 10 +-
.../settings/storage/EditorSettingsImpl.java | 10 +-
.../editor/settings/storage/SettingsProvider.java | 17 +-
.../settings/storage/api/EditorSettings.java | 8 +-
ide/options.editor/nbproject/project.properties | 2 +-
.../modules/options/colors/AnnotationsPanel.java | 271 +++++++++++----------
.../modules/options/colors/ColorModel.java | 15 +-
.../modules/options/colors/FontAndColorsPanel.java | 17 +-
.../options/colors/spi/FontsColorsController.java | 9 +
12 files changed, 195 insertions(+), 164 deletions(-)
copy
ide/{editor/src/org/netbeans/modules/editor/resources/NetBeans-annotations.xml
=> defaults/src/org/netbeans/modules/defaults/CityLights-annotations.xml} (100%)
copy
ide/{editor/src/org/netbeans/modules/editor/resources/NetBeans-annotations.xml
=> defaults/src/org/netbeans/modules/defaults/NetBeans55-annotations.xml} (100%)
copy
ide/{editor/src/org/netbeans/modules/editor/resources/NetBeans-annotations.xml
=> defaults/src/org/netbeans/modules/defaults/NetBeansEarth-annotations.xml}
(100%)
---------------------------------------------------------------------
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
