Merge master into GradleFrontendProject

gg-big-org · Apr 20, 2019 · e03eba2 · e03eba2
2 parents caa31fd + d3d19fa
commit e03eba2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/groovy/gradle/manifest.mf b/groovy/gradle/manifest.mf
@@ -4,3 +4,4 @@ OpenIDE-Module: org.netbeans.modules.gradle
 OpenIDE-Module-Layer: org/netbeans/modules/gradle/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.1
+OpenIDE-Module-Requires: cnb.org.netbeans.modules.groovy.kit
diff --git a/platform/api.htmlui/src/org/netbeans/modules/htmlui/NbBrowsers.java b/platform/api.htmlui/src/org/netbeans/modules/htmlui/NbBrowsers.java
@@ -60,29 +60,30 @@ public void run() {
 
     static void applyNbSkin() {
         LookAndFeel lookAndFeel = UIManager.getLookAndFeel();
-        String name = lookAndFeel.getName();
+        String name = findLafName(lookAndFeel.getName());
+        if (name == null) {
+            return;
+        }
+        String resource = "nbres:/org/netbeans/modules/htmlui/css/wizard-" + name + ".css";
+        loadCss(resource);
+    }
+
+    private static String findLafName(String name) {
         switch (name) {
             case "Mac OS X":
-                name = "mac";
-                break;
+                return "mac";
             case "Metal":
-                name = "metal";
-                break;
+                return "metal";
             case "GTK look and feel":
-                name = "gtk";
-                break;
+                return "gtk";
             case "Nimbus":
-                name = "nimbus";
-                break;
+                return "nimbus";
             case "Windows":
-                name = "win";
-                break;
+                return "win";
             case "Darcula":
-                name = "darcula";
-                break;
+                return "darcula";
         }
-        final String resource = "nbres:/org/netbeans/modules/htmlui/css/wizard-" + name + ".css";
-        loadCss(resource);
+        return null;
     }
 
     @JavaScriptBody(args = { "css" }, body =