--- openide.util/src/org/netbeans/modules/openide/util/NbBundleProcessor.java.orig	2015-11-02 14:35:02.000000000 +0100
+++ openide.util/src/org/netbeans/modules/openide/util/NbBundleProcessor.java	2016-02-11 10:39:30.115438512 +0100
@@ -272,7 +272,7 @@
                 }
                 try {
                     Set<String> restored = new TreeSet<String>();
-                    Matcher m = Pattern.compile("    /[*][*]\r?\n(?:     [*].+\r?\n)+     [*] @see (?:[\\w-]+)\r?\n     [*]/\r?\n    static String (\\w+).+\r?\n        .+\r?\n    [}]\r?\n").matcher(processingEnv.getFiler().getResource(StandardLocation.SOURCE_OUTPUT, pkg, "Bundle.java").getCharContent(false));
+                    Matcher m = Pattern.compile("    /[*][*]\r?\n(?:     [*].+\r?\n)+     [*] @see (?:[\\w-]+)\r?\n     [*]/\r?\n    static String ([\\w$]+).+\r?\n        .+\r?\n    [}]\r?\n").matcher(processingEnv.getFiler().getResource(StandardLocation.SOURCE_OUTPUT, pkg, "Bundle.java").getCharContent(false));
                     while (m.find()) {
                         String identifier = m.group(1);
                         if (!methods.containsKey(identifier)) {
--- openide.util.ui/src/org/netbeans/modules/openide/util/NbBundleProcessor.java.orig	2015-11-02 14:35:02.000000000 +0100
+++ openide.util.ui/src/org/netbeans/modules/openide/util/NbBundleProcessor.java	2016-02-11 10:41:19.195377570 +0100
@@ -272,7 +272,7 @@
                 }
                 try {
                     Set<String> restored = new TreeSet<String>();
-                    Matcher m = Pattern.compile("    /[*][*]\r?\n(?:     [*].+\r?\n)+     [*] @see (?:[\\w-]+)\r?\n     [*]/\r?\n    static String (\\w+).+\r?\n        .+\r?\n    [}]\r?\n").matcher(processingEnv.getFiler().getResource(StandardLocation.SOURCE_OUTPUT, pkg, "Bundle.java").getCharContent(false));
+                    Matcher m = Pattern.compile("    /[*][*]\r?\n(?:     [*].+\r?\n)+     [*] @see (?:[\\w-]+)\r?\n     [*]/\r?\n    static String ([\\w$]+).+\r?\n        .+\r?\n    [}]\r?\n").matcher(processingEnv.getFiler().getResource(StandardLocation.SOURCE_OUTPUT, pkg, "Bundle.java").getCharContent(false));
                     while (m.find()) {
                         String identifier = m.group(1);
                         if (!methods.containsKey(identifier)) {