Skip to content

Commit aed53ee

Browse files
Nils Eliassonrobcasloz
Nils Eliasson
and
robcasloz
committedNov 29, 2021
8264838: IGV: enhance graph export functionality
Co-authored-by: Roberto Castañeda Lozano <rcastanedalo@openjdk.org> Co-authored-by: Nils Eliasson <neliasso@openjdk.org> Reviewed-by: chagedorn, thartmann
·
JEP-429-branchpoint
1 parent 0c7a4b8 commit aed53ee

File tree

12 files changed

+94
-279
lines changed

12 files changed

+94
-279
lines changed
 

‎src/utils/IdealGraphVisualizer/.java-version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
15

‎src/utils/IdealGraphVisualizer/BatikSVGProxy/pom.xml

-85
This file was deleted.

‎src/utils/IdealGraphVisualizer/BatikSVGProxy/src/main/java/com/sun/hotspot/igv/svg/BatikSVG.java

-114
This file was deleted.

‎src/utils/IdealGraphVisualizer/BatikSVGProxy/src/main/java/com/sun/hotspot/igv/svg/package-info.java

-29
This file was deleted.

‎src/utils/IdealGraphVisualizer/BatikSVGProxy/src/main/nbm/manifest.mf

-5
This file was deleted.

‎src/utils/IdealGraphVisualizer/BatikSVGProxy/src/main/resources/com/sun/hotspot/igv/svg/Bundle.properties

-1
This file was deleted.

‎src/utils/IdealGraphVisualizer/View/pom.xml

+15-5
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,6 @@
8181
<artifactId>SelectionCoordinator</artifactId>
8282
<version>${project.version}</version>
8383
</dependency>
84-
<dependency>
85-
<groupId>com.sun.hotspot.igv</groupId>
86-
<artifactId>BatikSVGProxy</artifactId>
87-
<version>${project.version}</version>
88-
</dependency>
8984
<dependency>
9085
<groupId>com.sun.hotspot.igv</groupId>
9186
<artifactId>Settings</artifactId>
@@ -151,6 +146,21 @@
151146
<artifactId>org-netbeans-api-visual</artifactId>
152147
<version>${netbeans.version}</version>
153148
</dependency>
149+
<dependency>
150+
<groupId>org.apache.xmlgraphics</groupId>
151+
<artifactId>batik-dom</artifactId>
152+
<version>${batik.version}</version>
153+
</dependency>
154+
<dependency>
155+
<groupId>org.apache.xmlgraphics</groupId>
156+
<artifactId>batik-svggen</artifactId>
157+
<version>${batik.version}</version>
158+
</dependency>
159+
<dependency>
160+
<groupId>com.github.librepdf</groupId>
161+
<artifactId>openpdf</artifactId>
162+
<version>${openpdf.version}</version>
163+
</dependency>
154164
</dependencies>
155165
<build>
156166
<plugins>

‎src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewer.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
2727
import com.sun.hotspot.igv.graph.Figure;
2828
import java.awt.Component;
2929
import java.awt.Graphics2D;
30+
import java.awt.Rectangle;
3031
import java.util.Collection;
3132
import java.util.List;
3233
import javax.swing.JComponent;
@@ -44,7 +45,7 @@ enum InteractionMode {
4445
PANNING,
4546
}
4647

47-
public void paint(Graphics2D svgGenerator);
48+
public void paint(Graphics2D generator);
4849

4950
public Lookup getLookup();
5051

@@ -70,4 +71,6 @@ enum InteractionMode {
7071

7172
public void setInteractionMode(InteractionMode mode);
7273

74+
public Rectangle getBounds();
75+
7376
}

‎src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/EditorTopComponent.java

+61-25
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import com.sun.hotspot.igv.graph.Diagram;
3737
import com.sun.hotspot.igv.graph.Figure;
3838
import com.sun.hotspot.igv.graph.services.DiagramProvider;
39-
import com.sun.hotspot.igv.svg.BatikSVG;
4039
import com.sun.hotspot.igv.util.LookupHistory;
4140
import com.sun.hotspot.igv.util.RangeSlider;
4241
import com.sun.hotspot.igv.view.actions.*;
@@ -48,10 +47,21 @@
4847
import java.beans.PropertyChangeEvent;
4948
import java.beans.PropertyChangeListener;
5049
import java.io.*;
50+
import java.nio.charset.StandardCharsets;
5151
import java.util.List;
5252
import java.util.*;
5353
import javax.swing.*;
5454
import javax.swing.border.Border;
55+
import org.apache.batik.dom.GenericDOMImplementation;
56+
import org.apache.batik.svggen.SVGGeneratorContext;
57+
import org.apache.batik.svggen.SVGGraphics2D;
58+
import com.lowagie.text.Document;
59+
import com.lowagie.text.Rectangle;
60+
import com.lowagie.text.pdf.PdfWriter;
61+
import com.lowagie.text.pdf.PdfContentByte;
62+
import com.lowagie.text.pdf.PdfTemplate;
63+
import com.lowagie.text.pdf.PdfGraphics2D;
64+
import org.w3c.dom.DOMImplementation;
5565
import org.openide.DialogDisplayer;
5666
import org.openide.NotifyDescriptor;
5767
import org.openide.actions.RedoAction;
@@ -103,30 +113,14 @@ public final class EditorTopComponent extends TopComponent implements PropertyCh
103113
@Override
104114
public void export(File f) {
105115

106-
Graphics2D svgGenerator = BatikSVG.createGraphicsObject();
107-
108-
if (svgGenerator == null) {
109-
NotifyDescriptor message = new NotifyDescriptor.Message("For export to SVG files the Batik SVG Toolkit must be intalled.", NotifyDescriptor.ERROR_MESSAGE);
110-
DialogDisplayer.getDefault().notifyLater(message);
116+
String lcFileName = f.getName().toLowerCase();
117+
if (lcFileName.endsWith(".pdf")) {
118+
exportToPDF(scene, f);
119+
} else if (lcFileName.endsWith(".svg")) {
120+
exportToSVG(scene, f);
111121
} else {
112-
scene.paint(svgGenerator);
113-
FileOutputStream os = null;
114-
try {
115-
os = new FileOutputStream(f);
116-
Writer out = new OutputStreamWriter(os, UTF_8);
117-
BatikSVG.printToStream(svgGenerator, out, true);
118-
} catch (FileNotFoundException e) {
119-
NotifyDescriptor message = new NotifyDescriptor.Message("For export to SVG files the Batik SVG Toolkit must be intalled.", NotifyDescriptor.ERROR_MESSAGE);
120-
DialogDisplayer.getDefault().notifyLater(message);
121-
} finally {
122-
if (os != null) {
123-
try {
124-
os.close();
125-
} catch (IOException e) {
126-
}
127-
}
128-
}
129-
122+
NotifyDescriptor message = new NotifyDescriptor.Message("Unknown image file extension: expected either '.pdf' or '.svg'", NotifyDescriptor.ERROR_MESSAGE);
123+
DialogDisplayer.getDefault().notifyLater(message);
130124
}
131125
}
132126
};
@@ -639,5 +633,47 @@ public UndoRedo getUndoRedo() {
639633
@Override
640634
protected Object writeReplace() throws ObjectStreamException {
641635
throw new NotSerializableException();
642-
}
636+
}
637+
638+
private static void exportToPDF(DiagramViewer scene, File f) {
639+
int width = scene.getBounds().width;
640+
int height = scene.getBounds().height;
641+
com.lowagie.text.Document document = new Document(new Rectangle(width, height));
642+
PdfWriter writer = null;
643+
try {
644+
writer = PdfWriter.getInstance(document, new FileOutputStream(f));
645+
writer.setCloseStream(true);
646+
document.open();
647+
PdfContentByte contentByte = writer.getDirectContent();
648+
PdfTemplate template = contentByte.createTemplate(width, height);
649+
PdfGraphics2D pdfGenerator = new PdfGraphics2D(contentByte, width, height);
650+
scene.paint(pdfGenerator);
651+
pdfGenerator.dispose();
652+
contentByte.addTemplate(template, 0, 0);
653+
} catch (Exception e) {
654+
e.printStackTrace();
655+
} finally {
656+
if (document.isOpen()) {
657+
document.close();
658+
}
659+
if (writer != null) {
660+
writer.close();
661+
}
662+
}
663+
}
664+
665+
private static void exportToSVG(DiagramViewer scene, File f) {
666+
DOMImplementation dom = GenericDOMImplementation.getDOMImplementation();
667+
org.w3c.dom.Document document = dom.createDocument("http://www.w3.org/2000/svg", "svg", null);
668+
SVGGeneratorContext ctx = SVGGeneratorContext.createDefault(document);
669+
ctx.setEmbeddedFontsOn(true);
670+
SVGGraphics2D svgGenerator = new SVGGraphics2D(ctx, true);
671+
scene.paint(svgGenerator);
672+
try (FileOutputStream os = new FileOutputStream(f)) {
673+
Writer out = new OutputStreamWriter(os, StandardCharsets.UTF_8);
674+
svgGenerator.stream(out, true);
675+
} catch (IOException e) {
676+
e.printStackTrace();
677+
}
678+
}
643679
}

‎src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/actions/ExportAction.java

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@ public final class ExportAction extends CallableSystemAction implements LookupLi
4545
private final Lookup.Result<ExportCookie> result;
4646

4747
public ExportAction() {
48-
putValue(Action.SHORT_DESCRIPTION, "Export current graph as SVG file");
48+
putValue(Action.SHORT_DESCRIPTION, "Export current graph as image file");
4949
putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_MASK));
5050
lookup = Utilities.actionsGlobalContext();
5151
result = lookup.lookup(new Lookup.Template<>(ExportCookie.class));
@@ -66,12 +66,15 @@ public void performAction() {
6666

6767
@Override
6868
public boolean accept(File f) {
69-
return true;
69+
String lcFileName = f.getName().toLowerCase();
70+
return lcFileName.endsWith(".pdf") ||
71+
lcFileName.endsWith(".svg") ||
72+
f.isDirectory();
7073
}
7174

7275
@Override
7376
public String getDescription() {
74-
return "SVG files (*.svg)";
77+
return "Image files (*.pdf, *.svg)";
7578
}
7679
});
7780
fc.setCurrentDirectory(new File(Settings.get().get(Settings.DIRECTORY, Settings.DIRECTORY_DEFAULT)));
@@ -80,7 +83,7 @@ public String getDescription() {
8083
if (fc.showSaveDialog(null) == JFileChooser.APPROVE_OPTION) {
8184
File file = fc.getSelectedFile();
8285
if (!file.getName().contains(".")) {
83-
file = new File(file.getAbsolutePath() + ".svg");
86+
file = new File(file.getAbsolutePath() + ".pdf");
8487
}
8588

8689
File dir = file;

‎src/utils/IdealGraphVisualizer/application/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,6 @@
142142
<artifactId>Graal</artifactId>
143143
<version>${project.version}</version>
144144
</dependency>
145-
<dependency>
146-
<groupId>${project.groupId}</groupId>
147-
<artifactId>BatikSVGProxy</artifactId>
148-
<version>${project.version}</version>
149-
</dependency>
150145
<dependency>
151146
<groupId>${project.groupId}</groupId>
152147
<artifactId>View</artifactId>

‎src/utils/IdealGraphVisualizer/pom.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,17 @@
8686
<module>ServerCompiler</module>
8787
<module>FilterWindow</module>
8888
<module>Graal</module>
89-
<module>BatikSVGProxy</module>
9089
<module>View</module>
9190
</modules>
9291
<properties>
9392
<netbeans.version>RELEASE123</netbeans.version>
9493
<swinglayouts.version>1.0.2</swinglayouts.version>
95-
<nbmmvnplugin.version>4.3</nbmmvnplugin.version>
94+
<nbmmvnplugin.version>4.6</nbmmvnplugin.version>
9695
<mvncompilerplugin.version>3.8.1</mvncompilerplugin.version>
97-
<mvnjarplugin.version>3.1.2</mvnjarplugin.version>
96+
<mvnjarplugin.version>3.2.0</mvnjarplugin.version>
9897
<junit.version>4.13.2</junit.version>
98+
<batik.version>1.14</batik.version>
99+
<openpdf.version>1.3.26</openpdf.version>
99100
<brandingToken>idealgraphvisualizer</brandingToken>
100101
</properties>
101102
</project>

0 commit comments

Comments
 (0)
Please sign in to comment.