diff --git a/application/org.openjdk.jmc.flightrecorder.graphview/pom.xml b/application/org.openjdk.jmc.flightrecorder.graphview/pom.xml index 9e05408..733fcd4 100644 --- a/application/org.openjdk.jmc.flightrecorder.graphview/pom.xml +++ b/application/org.openjdk.jmc.flightrecorder.graphview/pom.xml @@ -42,80 +42,4 @@ org.openjdk.jmc.flightrecorder.graphview eclipse-plugin - - - 1.4.2 - process-resources - ${project.basedir}/src/main/resources/jslibs - ${basedir}/../../configuration/ide/eclipse/formatting/formatting.xml - ${basedir}/../../configuration/ide/eclipse/formatting/formattingjs.xml - - - - - - com.googlecode.maven-download-plugin - download-maven-plugin - ${download.maven.plugin.version} - - - d3-v5-js - ${download-maven-plugin.phase} - - wget - - - https://d3js.org/d3.v5.min.js - false - ${download-maven-plugin.output} - true - true - - - - wasm - ${download-maven-plugin.phase} - - wget - - - https://unpkg.com/@hpcc-js/wasm@0.3.14/dist/index.js - false - ${download-maven-plugin.output} - true - true - - - - d3-graphviz-js - ${download-maven-plugin.phase} - - wget - - - https://unpkg.com/d3-graphviz@3.1.0/build/d3-graphviz.js - false - ${download-maven-plugin.output} - true - true - - - - graphvizlib-wasm - ${download-maven-plugin.phase} - - wget - - - https://unpkg.com/@hpcc-js/wasm@0.3.14/dist/graphvizlib.wasm - false - ${download-maven-plugin.output} - true - true - - - - - - diff --git a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java index 1389545..d356c2e 100644 --- a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java +++ b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java @@ -85,18 +85,7 @@ import org.openjdk.jmc.ui.misc.DisplayToolkit; public class GraphView extends ViewPart implements ISelectionListener { private static final String HTML_PAGE; static { - String jsD3V5 = "jslibs/d3.v5.min.js"; - String jsGraphviz = "jslibs/index.js"; - String wasmGraphviz = "jslibs/graphvizlib.wasm"; - String jsGraphizD3 = "jslibs/d3-graphviz.js"; - - String wasmBase64 = loadBase64FromFile(wasmGraphviz); - - HTML_PAGE = String.format(loadStringFromFile("page.template"), loadLibraries(jsD3V5), - // we inline base64 wasm in the library code to avoid fetching it at runtime - loadStringFromFile(jsGraphviz, "wasmBinaryFile=\"graphvizlib.wasm\";", - "wasmBinaryFile=dataURIPrefix + '" + wasmBase64 + "';"), - loadLibraries(jsGraphizD3)); + HTML_PAGE = String.format(loadStringFromFile("page.template")); } private enum ModelState { diff --git a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/resources/page.template b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/resources/page.template index eb7423a..e424576 100644 --- a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/resources/page.template +++ b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/resources/page.template @@ -3,12 +3,13 @@ - - - + + + +