Merge pull request apache#632 from pnabbefeld/master

NETBEANS-1035: Made org.netbeans.modules.web.wicket a friend of html.…
davidmr001 · Jul 11, 2018 · 396c685 · 396c685
2 parents a640484 + 67b2d28
commit 396c685
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/html.editor.lib/nbproject/project.xml b/html.editor.lib/nbproject/project.xml
@@ -272,8 +272,8 @@
                 <friend>org.netbeans.modules.javascript2.editor</friend>
                 <friend>org.netbeans.modules.javascript2.jade</friend>
                 <friend>org.netbeans.modules.javascript2.jquery</friend>
-                <friend>org.netbeans.modules.javascript2.requirejs</friend>
                 <friend>org.netbeans.modules.javascript2.react</friend>
+                <friend>org.netbeans.modules.javascript2.requirejs</friend>
                 <friend>org.netbeans.modules.php.latte</friend>
                 <friend>org.netbeans.modules.ruby.rhtml</friend>
                 <friend>org.netbeans.modules.web.core.syntax</friend>
@@ -283,6 +283,7 @@
                 <friend>org.netbeans.modules.web.jsf.editor</friend>
                 <friend>org.netbeans.modules.web.jsfapi</friend>
                 <friend>org.netbeans.modules.web.livehtml</friend>
+                <friend>org.netbeans.modules.web.wicket</friend>
                 <package>org.netbeans.modules.html.editor.lib.api</package>
                 <package>org.netbeans.modules.html.editor.lib.api.dtd</package>
                 <package>org.netbeans.modules.html.editor.lib.api.elements</package>

diff --git a/html.editor/nbproject/project.xml b/html.editor/nbproject/project.xml
@@ -536,9 +536,9 @@
                 <friend>org.netbeans.modules.html.knockout</friend>
                 <friend>org.netbeans.modules.html.ojet</friend>
                 <friend>org.netbeans.modules.javascript2.editor</friend>
-                <friend>org.netbeans.modules.javascript2.requirejs</friend>
                 <friend>org.netbeans.modules.javascript2.nodejs</friend>
                 <friend>org.netbeans.modules.javascript2.react</friend>
+                <friend>org.netbeans.modules.javascript2.requirejs</friend>
                 <friend>org.netbeans.modules.php.latte</friend>
                 <friend>org.netbeans.modules.ruby.rhtml</friend>
                 <friend>org.netbeans.modules.web.clientproject</friend>
@@ -547,6 +547,7 @@
                 <friend>org.netbeans.modules.web.el</friend>
                 <friend>org.netbeans.modules.web.jsf</friend>
                 <friend>org.netbeans.modules.web.jsf.editor</friend>
+                <friend>org.netbeans.modules.web.wicket</friend>
                 <package>org.netbeans.modules.html.editor.api</package>
                 <package>org.netbeans.modules.html.editor.api.actions</package>
                 <package>org.netbeans.modules.html.editor.api.completion</package>