[netbeans] 05/13: Merge NbParseTreeBuilder.patch into Css3Parser-antlr.patch.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository netbeans.

commit f8f2eedb54e41ff4098874027e2a8c71b4b4a743
Author: Markus Koschany <apo at gambaru.de>
Date:   Sun Jun 14 21:26:27 2015 +0200

    Merge NbParseTreeBuilder.patch into Css3Parser-antlr.patch.
---
 debian/patches/Css3Parser-antlr.patch | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/debian/patches/Css3Parser-antlr.patch b/debian/patches/Css3Parser-antlr.patch
index b5e8c81..0664743 100644
--- a/debian/patches/Css3Parser-antlr.patch
+++ b/debian/patches/Css3Parser-antlr.patch
@@ -8,7 +8,8 @@ can be removed when antlr >= 3.4 is packaged for Debian.
 Forwarded: not-needed
 ---
  .../org/netbeans/modules/css/lib/Css3Parser.java   | 818 ++++++++++-----------
- 1 file changed, 409 insertions(+), 409 deletions(-)
+ .../modules/css/lib/NbParseTreeBuilder.java        |   2 +-
+ 2 files changed, 410 insertions(+), 410 deletions(-)
 
 diff --git a/css.lib/src/org/netbeans/modules/css/lib/Css3Parser.java b/css.lib/src/org/netbeans/modules/css/lib/Css3Parser.java
 index e232e2c..d9c957b 100644
@@ -3693,3 +3694,16 @@ index e232e2c..d9c957b 100644
 -}
 \ No newline at end of file
 +}
+diff --git a/css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java b/css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java
+index bbb50fa..1b9c354 100644
+--- a/css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java
++++ b/css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java
+@@ -101,7 +101,7 @@ public class NbParseTreeBuilder extends BlankDebugEventListener {
+ 
+     /** Backtracking or cyclic DFA, don't want to add nodes to tree */
+     @Override
+-    public void enterDecision(int d, boolean couldBacktrack) {
++    public void enterDecision(int d) {
+         backtracking++;
+     }
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git