1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
From: Ole Streicher <olebole@debian.org>
Date: Sun, 18 Dec 2016 13:26:40 +0100
Subject: Use jlibeps.sourceforge.net
org.jibble.epsgraphics is not free anymore, and not packaged for Debian.
net.sourceforge.jlibeps provides a dropin replacement.
eps
---
src/main/uk/ac/starlink/ttools/plot/DensityPlot.java | 2 +-
src/main/uk/ac/starlink/ttools/plot/FixedEpsGraphics2D.java | 4 ++--
src/main/uk/ac/starlink/ttools/plot/GraphicExporter.java | 2 +-
src/main/uk/ac/starlink/ttools/plot/ScatterPlot.java | 2 +-
src/main/uk/ac/starlink/ttools/plot/TablePlot.java | 2 +-
src/main/uk/ac/starlink/ttools/plot2/PlotUtil.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/uk/ac/starlink/ttools/plot/DensityPlot.java b/src/main/uk/ac/starlink/ttools/plot/DensityPlot.java
index 6a2a063..9a6889d 100644
--- a/src/main/uk/ac/starlink/ttools/plot/DensityPlot.java
+++ b/src/main/uk/ac/starlink/ttools/plot/DensityPlot.java
@@ -461,7 +461,7 @@ public class DensityPlot extends SurfacePlot {
/* Tweak so that exact positioning of lines between pixel and
* graphics plotting doesn't look wrong. Possibly this is only
- * required for (a bug in) org.jibble.epsgraphics.EpsGraphics2D? */
+ * required for (a bug in) net.sf.epsgraphics.EpsGraphics2D? */
if ( isVectorContext( g ) ) {
Rectangle clip = getSurface().getClip().getBounds();
int cx = clip.x - 2;
diff --git a/src/main/uk/ac/starlink/ttools/plot/FixedEpsGraphics2D.java b/src/main/uk/ac/starlink/ttools/plot/FixedEpsGraphics2D.java
index 9ce23fe..e9980e8 100644
--- a/src/main/uk/ac/starlink/ttools/plot/FixedEpsGraphics2D.java
+++ b/src/main/uk/ac/starlink/ttools/plot/FixedEpsGraphics2D.java
@@ -5,13 +5,13 @@ import java.awt.Shape;
import java.io.FilterOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import org.jibble.epsgraphics.EpsGraphics2D;
+import org.sourceforge.jlibeps.epsgraphics.EpsGraphics2D;
/**
* Graphics2D implementation which can write to Encapsulated PostScript.
*
* <p>This is a very slight modification of
- * <code>org.jibble.epsgraphics.EpsGraphics2D</code>
+ * <code>net.sf.epsgraphics.EpsGraphics2D</code>
* which addresses some (apparent?) bugs in that class.
* The jibble library used to be GPL but is now released under a more
* restrictive (and expensive) license, so applying a fix to the original
diff --git a/src/main/uk/ac/starlink/ttools/plot/GraphicExporter.java b/src/main/uk/ac/starlink/ttools/plot/GraphicExporter.java
index 0bbf636..9b340ae 100644
--- a/src/main/uk/ac/starlink/ttools/plot/GraphicExporter.java
+++ b/src/main/uk/ac/starlink/ttools/plot/GraphicExporter.java
@@ -23,7 +23,7 @@ import org.jfree.graphics2d.svg.PreserveAspectRatio;
import org.jfree.graphics2d.svg.SVGGraphics2D;
import org.jfree.graphics2d.svg.SVGUnits;
import org.jfree.graphics2d.svg.ViewBox;
-import org.jibble.epsgraphics.EpsGraphics2D;
+import org.sourceforge.jlibeps.epsgraphics.EpsGraphics2D;
/**
* Exports painted graphics to an output file in some graphics format.
diff --git a/src/main/uk/ac/starlink/ttools/plot/ScatterPlot.java b/src/main/uk/ac/starlink/ttools/plot/ScatterPlot.java
index 5bac34a..97f3ddd 100644
--- a/src/main/uk/ac/starlink/ttools/plot/ScatterPlot.java
+++ b/src/main/uk/ac/starlink/ttools/plot/ScatterPlot.java
@@ -1046,7 +1046,7 @@ public class ScatterPlot extends SurfacePlot {
* pixel out to get the image border and a further one
* to cover the remains of that border in the vector
* context. That gives you the right look using the
- * org.jibble.epsgraphics.EpsGraphics2D context anyway.
+ * net.sf.epsgraphics.EpsGraphics2D context anyway.
* I'm not sure if having to do this is a bug in the
* Jibble renderer. */
Rectangle clip = getSurface().getClip().getBounds();
diff --git a/src/main/uk/ac/starlink/ttools/plot/TablePlot.java b/src/main/uk/ac/starlink/ttools/plot/TablePlot.java
index 2539bbe..5f1e0e1 100644
--- a/src/main/uk/ac/starlink/ttools/plot/TablePlot.java
+++ b/src/main/uk/ac/starlink/ttools/plot/TablePlot.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.swing.JComponent;
import javax.swing.SwingUtilities;
-import org.jibble.epsgraphics.EpsGraphics2D;
+import org.sourceforge.jlibeps.epsgraphics.EpsGraphics2D;
/**
* Superclass for all components which draw plots from table data.
diff --git a/src/main/uk/ac/starlink/ttools/plot2/PlotUtil.java b/src/main/uk/ac/starlink/ttools/plot2/PlotUtil.java
index a0182c3..513cf75 100644
--- a/src/main/uk/ac/starlink/ttools/plot2/PlotUtil.java
+++ b/src/main/uk/ac/starlink/ttools/plot2/PlotUtil.java
@@ -27,7 +27,7 @@ import java.util.function.Supplier;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.Icon;
-import org.jibble.epsgraphics.EpsGraphics2D;
+import org.sourceforge.jlibeps.epsgraphics.EpsGraphics2D;
import uk.ac.starlink.table.ValueInfo;
import uk.ac.starlink.ttools.plot.PdfGraphicExporter;
import uk.ac.starlink.ttools.plot.Picture;
|
