This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 43739842d98 Merge pull request #8867 from
NicolaIsotta/elimplicitobjects
add 3d84015f864 Fix warnings: ELOccurrencesFinder, CssOccurrencesFinder,
ScssCslLanguage, PHP OccurrencesFinderImpl
add a5ef0b4d402 GSF/CSL Languages: Centralize "Enable Occurrences
Hightlight" and "Keep Marks" Handling
add 3a6d3fab870 Make occurrence highlighting configurable: Antlr 3+4,
Groovy, Expression Language, CSS, JS, JSON
add cde0836debe Merge pull request #8844 from
matthiasblaesing/csl_mark_occurrences
No new revisions were added by this update.
Summary of changes:
enterprise/web.el/nbproject/project.xml | 8 ++
.../modules/web/el/ELOccurrencesFinder.java | 55 +++++++------
.../src/org/netbeans/modules/web/el/layer.xml | 10 +++
.../modules/web/el/options}/Bundle.properties | 10 ++-
.../MarkOccurencesOptionsPanelController.java | 95 ++++++++++++++++++++++
.../web/el}/options/MarkOccurencesPanel.form | 59 ++++++--------
.../web/el}/options/MarkOccurencesPanel.java | 56 ++++++-------
.../web/el/options/MarkOccurencesSettings.java | 46 +++++++++++
.../editor/api/parser/GroovyOccurrencesFinder.java | 15 ++++
.../groovy/editor/options}/Bundle.properties | 10 ++-
.../MarkOccurencesOptionsPanelController.java | 95 ++++++++++++++++++++++
.../editor/options/MarkOccurencesPanel.form | 59 ++++++--------
.../editor/options/MarkOccurencesPanel.java | 58 ++++++-------
.../editor/options/MarkOccurencesSettings.java | 46 +++++++++++
.../modules/groovy/editor/resources/layer.xml | 10 +++
ide/csl.api/apichanges.xml | 19 +++++
.../modules/csl/api/OccurrencesFinder.java | 24 ++++++
.../semantic/MarkOccurrencesHighlighter.java | 31 +++++--
ide/css.editor/nbproject/project.xml | 19 +++--
.../css/editor/csl/CssOccurrencesFinder.java | 24 ++++--
.../modules/css/editor/options}/Bundle.properties | 10 ++-
.../MarkOccurencesOptionsPanelController.java | 95 ++++++++++++++++++++++
.../css}/editor/options/MarkOccurencesPanel.form | 59 ++++++--------
.../css}/editor/options/MarkOccurencesPanel.java | 59 ++++++--------
.../css/editor/options/MarkOccurencesSettings.java | 46 +++++++++++
.../org/netbeans/modules/css/resources/layer.xml | 10 +++
.../css/prep/editor/scss/ScssCslLanguage.java | 1 -
java/languages.antlr/nbproject/project.xml | 9 ++
.../languages/antlr/AntlrOccurrencesFinder.java | 17 +++-
.../org/netbeans/modules/languages/antlr/layer.xml | 16 ++++
.../modules/languages/antlr/v3/Antlr3Language.java | 2 +-
.../modules/languages/antlr/v3}/Bundle.properties | 10 ++-
.../v3/MarkOccurencesOptionsPanelController.java | 95 ++++++++++++++++++++++
.../languages/antlr/v3}/MarkOccurencesPanel.form | 59 ++++++--------
.../languages/antlr/v3}/MarkOccurencesPanel.java | 58 ++++++-------
.../languages/antlr/v3/MarkOccurencesSettings.java | 42 ++++++++++
.../modules/languages/antlr/v4/Antlr4Language.java | 2 +-
.../modules/languages/antlr/v4}/Bundle.properties | 10 ++-
.../v4/MarkOccurencesOptionsPanelController.java | 95 ++++++++++++++++++++++
.../languages/antlr/v4}/MarkOccurencesPanel.form | 59 ++++++--------
.../languages/antlr/v4}/MarkOccurencesPanel.java | 58 ++++++-------
.../languages/antlr/v4/MarkOccurencesSettings.java | 42 ++++++++++
.../php/editor/csl/OccurrencesFinderImpl.java | 55 ++++++-------
.../php/editor/options/MarkOccurencesPanel.form | 42 +++-------
.../php/editor/options/MarkOccurencesPanel.java | 52 ++++++------
.../editor/navigation/JsonOccurrencesFinder.java | 15 ++++
.../editor/navigation/OccurrencesFinderImpl.java | 15 ++++
.../editor/options/ui/Bundle.properties | 7 ++
.../ui/MarkOccurencesOptionsPanelController.java | 95 ++++++++++++++++++++++
.../editor/options/ui}/MarkOccurencesPanel.form | 59 ++++++--------
.../editor/options/ui}/MarkOccurencesPanel.java | 58 ++++++-------
.../editor/options/ui/MarkOccurencesSettings.java | 42 ++++++++++
.../editor/options/ui/json/Bundle.properties | 7 ++
.../json/MarkOccurencesOptionsPanelController.java | 95 ++++++++++++++++++++++
.../options/ui/json}/MarkOccurencesPanel.form | 59 ++++++--------
.../options/ui/json}/MarkOccurencesPanel.java | 58 ++++++-------
.../options/ui/json/MarkOccurencesSettings.java | 42 ++++++++++
.../modules/javascript2/editor/resources/layer.xml | 16 ++++
58 files changed, 1678 insertions(+), 642 deletions(-)
copy
{webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/options/ui/json
=>
enterprise/web.el/src/org/netbeans/modules/web/el/options}/Bundle.properties
(62%)
create mode 100644
enterprise/web.el/src/org/netbeans/modules/web/el/options/MarkOccurencesOptionsPanelController.java
copy {php/php.editor/src/org/netbeans/modules/php/editor =>
enterprise/web.el/src/org/netbeans/modules/web/el}/options/MarkOccurencesPanel.form
(61%)
copy {php/php.editor/src/org/netbeans/modules/php/editor =>
enterprise/web.el/src/org/netbeans/modules/web/el}/options/MarkOccurencesPanel.java
(83%)
create mode 100644
enterprise/web.el/src/org/netbeans/modules/web/el/options/MarkOccurencesSettings.java
copy
{webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/options/ui/json
=>
groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/options}/Bundle.properties
(63%)
create mode 100644
groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/options/MarkOccurencesOptionsPanelController.java
copy {php/php.editor/src/org/netbeans/modules/php =>
groovy/groovy.editor/src/org/netbeans/modules/groovy}/editor/options/MarkOccurencesPanel.form
(60%)
copy {php/php.editor/src/org/netbeans/modules/php =>
groovy/groovy.editor/src/org/netbeans/modules/groovy}/editor/options/MarkOccurencesPanel.java
(83%)
create mode 100644
groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/options/MarkOccurencesSettings.java
copy
{webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/options/ui/json
=>
ide/css.editor/src/org/netbeans/modules/css/editor/options}/Bundle.properties
(63%)
create mode 100644
ide/css.editor/src/org/netbeans/modules/css/editor/options/MarkOccurencesOptionsPanelController.java
copy {php/php.editor/src/org/netbeans/modules/php =>
ide/css.editor/src/org/netbeans/modules/css}/editor/options/MarkOccurencesPanel.form
(73%)
copy {php/php.editor/src/org/netbeans/modules/php =>
ide/css.editor/src/org/netbeans/modules/css}/editor/options/MarkOccurencesPanel.java
(83%)
create mode 100644
ide/css.editor/src/org/netbeans/modules/css/editor/options/MarkOccurencesSettings.java
copy
{webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/options/ui/json
=>
java/languages.antlr/src/org/netbeans/modules/languages/antlr/v3}/Bundle.properties
(63%)
create mode 100644
java/languages.antlr/src/org/netbeans/modules/languages/antlr/v3/MarkOccurencesOptionsPanelController.java
copy {php/php.editor/src/org/netbeans/modules/php/editor/options =>
java/languages.antlr/src/org/netbeans/modules/languages/antlr/v3}/MarkOccurencesPanel.form
(69%)
copy {php/php.editor/src/org/netbeans/modules/php/editor/options =>
java/languages.antlr/src/org/netbeans/modules/languages/antlr/v3}/MarkOccurencesPanel.java
(83%)
create mode 100644
java/languages.antlr/src/org/netbeans/modules/languages/antlr/v3/MarkOccurencesSettings.java
copy
{webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/options/ui/json
=>
java/languages.antlr/src/org/netbeans/modules/languages/antlr/v4}/Bundle.properties
(63%)
create mode 100644
java/languages.antlr/src/org/netbeans/modules/languages/antlr/v4/MarkOccurencesOptionsPanelController.java
copy {php/php.editor/src/org/netbeans/modules/php/editor/options =>
java/languages.antlr/src/org/netbeans/modules/languages/antlr/v4}/MarkOccurencesPanel.form
(69%)
copy {php/php.editor/src/org/netbeans/modules/php/editor/options =>
java/languages.antlr/src/org/netbeans/modules/languages/antlr/v4}/MarkOccurencesPanel.java
(83%)
create mode 100644
java/languages.antlr/src/org/netbeans/modules/languages/antlr/v4/MarkOccurencesSettings.java
create mode 100644
webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/options/ui/MarkOccurencesOptionsPanelController.java
copy {php/php.editor/src/org/netbeans/modules/php/editor/options =>
webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/options/ui}/MarkOccurencesPanel.form
(61%)
copy {php/php.editor/src/org/netbeans/modules/php/editor/options =>
webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/options/ui}/MarkOccurencesPanel.java
(83%)
create mode 100644
webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/options/ui/MarkOccurencesSettings.java
create mode 100644
webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/options/ui/json/MarkOccurencesOptionsPanelController.java
copy {php/php.editor/src/org/netbeans/modules/php/editor/options =>
webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/options/ui/json}/MarkOccurencesPanel.form
(60%)
copy {php/php.editor/src/org/netbeans/modules/php/editor/options =>
webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/options/ui/json}/MarkOccurencesPanel.java
(83%)
create mode 100644
webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/options/ui/json/MarkOccurencesSettings.java
---------------------------------------------------------------------
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
