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
|
From: Ole Streicher <olebole@debian.org>
Date: Tue, 22 Sep 2020 14:40:03 +0200
Subject: Fix import path for jfree.svg
---
src/main/uk/ac/starlink/ttools/plot/GraphicExporter.java | 10 +++++-----
src/main/uk/ac/starlink/ttools/server/PlotSession.java | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/uk/ac/starlink/ttools/plot/GraphicExporter.java b/src/main/uk/ac/starlink/ttools/plot/GraphicExporter.java
index 9b340ae..44c5618 100644
--- a/src/main/uk/ac/starlink/ttools/plot/GraphicExporter.java
+++ b/src/main/uk/ac/starlink/ttools/plot/GraphicExporter.java
@@ -18,11 +18,11 @@ import java.util.List;
import java.util.zip.GZIPOutputStream;
import javax.imageio.ImageIO;
import javax.swing.JComponent;
-import org.jfree.graphics2d.svg.MeetOrSlice;
-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.jfree.svg.MeetOrSlice;
+import org.jfree.svg.PreserveAspectRatio;
+import org.jfree.svg.SVGGraphics2D;
+import org.jfree.svg.SVGUnits;
+import org.jfree.svg.ViewBox;
import org.sourceforge.jlibeps.epsgraphics.EpsGraphics2D;
/**
diff --git a/src/main/uk/ac/starlink/ttools/server/PlotSession.java b/src/main/uk/ac/starlink/ttools/server/PlotSession.java
index 7ca042a..815ae30 100644
--- a/src/main/uk/ac/starlink/ttools/server/PlotSession.java
+++ b/src/main/uk/ac/starlink/ttools/server/PlotSession.java
@@ -35,8 +35,8 @@ import java.io.Reader;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.jfree.graphics2d.svg.SVGGraphics2D;
-import org.jfree.graphics2d.svg.SVGUnits;
+import org.jfree.svg.SVGGraphics2D;
+import org.jfree.svg.SVGUnits;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
|