modules/graphics/src/main/java/com/sun/javafx/tk/Toolkit.java

rev 9619 : [mq]: 9-jake.patch

*** 192,209 ****
  
          boolean printToolkit = verbose
                  || (userSpecifiedToolkit && !forcedToolkit.endsWith("StubToolkit"));
  
          try {
!             Class<?> clz = Class.forName(forcedToolkit, false, Toolkit.class.getClassLoader());
              // Check that clz is a subclass of Toolkit
              if (!Toolkit.class.isAssignableFrom(clz)) {
                  throw new IllegalArgumentException("Unrecognized FX Toolkit class: "
                          + forcedToolkit);
              }
  
!             TOOLKIT = (Toolkit) clz.newInstance();
              if (TOOLKIT.init()) {
                  if (printToolkit) {
                      System.err.println("JavaFX: using " + forcedToolkit);
                  }
                  return TOOLKIT;
--- 192,220 ----
  
          boolean printToolkit = verbose
                  || (userSpecifiedToolkit && !forcedToolkit.endsWith("StubToolkit"));
  
          try {
!             Class clz = null;
! 
!             try {
!                 // try our priveledged loader first
!                 final ClassLoader loader = Toolkit.class.getClassLoader();
!                 clz = Class.forName(forcedToolkit, false, loader);
!             } catch (ClassNotFoundException e) {
!                 // fall back and try the application class loader
!                 final ClassLoader loader = Thread.currentThread().getContextClassLoader();
!                 clz = Class.forName(forcedToolkit, false, loader);
!             }
! 
              // Check that clz is a subclass of Toolkit
              if (!Toolkit.class.isAssignableFrom(clz)) {
                  throw new IllegalArgumentException("Unrecognized FX Toolkit class: "
                          + forcedToolkit);
              }
  
!             TOOLKIT = (Toolkit)clz.newInstance();
              if (TOOLKIT.init()) {
                  if (printToolkit) {
                      System.err.println("JavaFX: using " + forcedToolkit);
                  }
                  return TOOLKIT;
*** 502,521 ****
      // this flag is cleared each cycle so subsequent pulses must be requested
      public abstract void requestNextPulse();
  
      public abstract Future addRenderJob(RenderJob rj);
  
-     public InputStream getInputStream(String url, Class base)
-             throws IOException {
-         return (url.startsWith("http:")
-                     || url.startsWith("https:")
-                     || url.startsWith("file:")
-                     || url.startsWith("jar:"))
-                         ? new java.net.URL(url).openStream()
-                         : base.getResource(url).openStream();
-     }
- 
      public abstract ImageLoader loadImage(String url,
                                            int width, int height,
                                            boolean preserveRatio,
                                            boolean smooth);
      public abstract ImageLoader loadImage(InputStream stream,
--- 513,522 ----