modules/graphics/src/main/java/com/sun/javafx/css/StyleManager.java

rev 9717 : 8151320: Remove unnecessary addReads from JavaFX

*** 1039,1058 ****
      }
  
      private static final String skinPrefix = "com/sun/javafx/scene/control/skin/";
      private static final String controlClassName = "javafx.scene.control.Control";
  
      private static InputStream getInputStream(String fname) {
          if (fname.startsWith(skinPrefix) &&
                  (fname.endsWith(".css") || fname.endsWith(".bss"))) {
  
              try {
                  ClassLoader cl = StyleManager.class.getClassLoader();
                  Class<?> clz = Class.forName(controlClassName, false, cl);
                  Object controlsModule = ModuleHelper.getModule(clz);
-                 Object thisModule = ModuleHelper.getModule(StyleManager.class);
-                 ModuleHelper.addReads(thisModule, controlsModule);
                  return ModuleHelper.getResourceAsStream(controlsModule, fname);
              } catch (ClassNotFoundException ex) {
                  ex.printStackTrace();
                  return null;
              }
--- 1039,1057 ----
      }
  
      private static final String skinPrefix = "com/sun/javafx/scene/control/skin/";
      private static final String controlClassName = "javafx.scene.control.Control";
  
+     // FIXME: JIGSAW -- we should be able to revert this change
      private static InputStream getInputStream(String fname) {
          if (fname.startsWith(skinPrefix) &&
                  (fname.endsWith(".css") || fname.endsWith(".bss"))) {
  
              try {
                  ClassLoader cl = StyleManager.class.getClassLoader();
                  Class<?> clz = Class.forName(controlClassName, false, cl);
                  Object controlsModule = ModuleHelper.getModule(clz);
                  return ModuleHelper.getResourceAsStream(controlsModule, fname);
              } catch (ClassNotFoundException ex) {
                  ex.printStackTrace();
                  return null;
              }
*** 1071,1080 ****
--- 1070,1080 ----
                  // and binary.css is set to false
                  return (!fname.endsWith(".bss") && bss != null) ?
                      !Boolean.valueOf(bss) : Boolean.FALSE;
              });
              // FIXME: JIGSAW -- handle bss
+             // FIXME: JIGSAW -- we should be able to revert the changes here
              parse = true;
  
              try {
                  final String ext = (parse) ? (".css") : (".bss");
                  java.net.URL url;