Use alternative JxBrowser class loading for 2021.1 (#5453)

* Try alternative class loading

* Fix full file paths

* Correct substitutions

Author: helin24

src/io/flutter/jxbrowser/JxBrowserManager.java

@@ -20,7 +20,6 @@
 import com.intellij.util.download.DownloadableFileService;
 import com.intellij.util.download.FileDownloader;
 import com.teamdev.jxbrowser.browser.UnsupportedRenderingModeException;
-import com.teamdev.jxbrowser.callback.Callback;
 import com.teamdev.jxbrowser.engine.RenderingMode;
 import io.flutter.FlutterInitializer;
 import io.flutter.settings.FlutterSettings;
@@ -31,6 +30,8 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -280,6 +281,32 @@ private void loadClasses(String[] fileNames) {
     installation.complete(JxBrowserStatus.INSTALLED);
   }
 
+  private void loadClasses2021(String[] fileNames) {
+    List<Path> paths = new ArrayList<>();
+
+    try {
+      for (String fileName: fileNames) {
+        paths.add(Paths.get(getFilePath(fileName)));
+      }
+      FileUtils.getInstance().loadPaths(this.getClass().getClassLoader(), paths);
+    } catch (Exception ex) {
+      LOG.info("Failed to load JxBrowser file", ex);
+      setStatusFailed("classLoadFailed");
+      return;
+    }
+
+    try {
+      final UnsupportedRenderingModeException test = new UnsupportedRenderingModeException(RenderingMode.HARDWARE_ACCELERATED);
+    } catch (NoClassDefFoundError e) {
+      LOG.info("Failed to find JxBrowser class");
+      setStatusFailed("NoClassDefFoundError");
+      return;
+    }
+    FlutterInitializer.getAnalytics().sendEvent(ANALYTICS_CATEGORY, "installed");
+    status.set(JxBrowserStatus.INSTALLED);
+    installation.complete(JxBrowserStatus.INSTALLED);
+  }
+
   private String getFilePath(String fileName) {
     return DOWNLOAD_PATH + File.separatorChar + fileName;
   }

src/io/flutter/utils/FileUtils.java

@@ -9,6 +9,8 @@
 
 import java.io.File;
 import java.net.URL;
+import java.nio.file.Path;
+import java.util.List;
 
 public class FileUtils {
   private static FileUtils fileUtils;
@@ -62,4 +64,16 @@ public void loadClass(ClassLoader classLoader, String path) throws Exception {
     final URL url = file.toURI().toURL();
     urlClassLoader.addURL(url);
   }
+
+  /**
+   * Loads a list of file paths with a class loader.
+   *
+   * This is only available for versions 211.4961.30 and later.
+   * @param classLoader classloader that can be used as a UrlClassLoader to load the files.
+   * @param paths list of file paths to load.
+   */
+  public void loadPaths(ClassLoader classLoader, List<Path> paths) {
+    final UrlClassLoader urlClassLoader = (UrlClassLoader) classLoader;
+    //urlClassLoader.addFiles(paths);
+  }
 }

tool/plugin/lib/edit.dart

@@ -122,6 +122,18 @@ List<EditCommand> editCommands = [
     replacement: 'new JsonParser().parse(contents)',
     version: 'AF.3.1',
   ),
+  Subst(
+    path: 'src/io/flutter/jxbrowser/JxBrowserManager.java',
+    initial: 'loadClasses(fileNames)',
+    replacement: 'loadClasses2021(fileNames)',
+    versions: ['2021.1'],
+  ),
+  Subst(
+    path: 'src/io/flutter/utils/FileUtils.java',
+    initial: '//urlClassLoader.addFiles(paths)',
+    replacement: 'urlClassLoader.addFiles(paths)',
+    versions: ['2021.1'],
+  ),
 ];
 
 // Used to test checkAndClearAppliedEditCommands()