Fix FTBFS with new jebl2
Andreas Tille
3 years ago
|
0 |
figtree (1.4.4-5) UNRELEASED; urgency=medium
|
|
1 |
|
|
2 |
[ Sudip Mukherjee ]
|
|
3 |
* Fix FTBFS with new jebl2
|
|
4 |
Closes: #966878
|
|
5 |
|
|
6 |
-- Andreas Tille <tille@debian.org> Wed, 05 Aug 2020 18:58:53 +0200
|
|
7 |
|
0 | 8 |
figtree (1.4.4-4) unstable; urgency=medium
|
1 | 9 |
|
2 | 10 |
* Do not Build-Depend libfreehep-graphics*
|
|
0 |
Description: Fix FTBFS
|
|
1 |
The recent update of jebl2 removed the 'IOException' and has also added
|
|
2 |
close() which needs to be overriden.
|
|
3 |
|
|
4 |
Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
|
|
5 |
Bug-Debian: https://bugs.debian.org/966878
|
|
6 |
Forwarded: no
|
|
7 |
|
|
8 |
---
|
|
9 |
|
|
10 |
--- figtree-1.4.4.orig/src/figtree/application/JSONTreeExporter.java
|
|
11 |
+++ figtree-1.4.4/src/figtree/application/JSONTreeExporter.java
|
|
12 |
@@ -80,13 +80,13 @@ public class JSONTreeExporter implements
|
|
13 |
* @throws java.io.IOException
|
|
14 |
*/
|
|
15 |
@Override
|
|
16 |
- public void exportTree(Tree tree) throws IOException {
|
|
17 |
+ public void exportTree(Tree tree) {
|
|
18 |
java.util.List<Tree> trees = new ArrayList<Tree>();
|
|
19 |
trees.add(tree);
|
|
20 |
exportTrees(trees);
|
|
21 |
}
|
|
22 |
|
|
23 |
- private void writeTrees(Collection<? extends Tree> trees) throws IOException {
|
|
24 |
+ private void writeTrees(Collection<? extends Tree> trees) {
|
|
25 |
int indent = 0;
|
|
26 |
int treeCount = 0;
|
|
27 |
|
|
28 |
@@ -178,10 +178,15 @@ public class JSONTreeExporter implements
|
|
29 |
}
|
|
30 |
|
|
31 |
@Override
|
|
32 |
- public void exportTrees(Collection<? extends Tree> trees) throws IOException {
|
|
33 |
+ public void exportTrees(Collection<? extends Tree> trees) {
|
|
34 |
writeTrees(trees);
|
|
35 |
}
|
|
36 |
|
|
37 |
+ @Override
|
|
38 |
+ public void close() {
|
|
39 |
+ close();
|
|
40 |
+ }
|
|
41 |
+
|
|
42 |
final private String nameRegex = "^(\\w|-)+$";
|
|
43 |
|
|
44 |
|
3 | 3 |
fix_itext_api_change.patch
|
4 | 4 |
fix_jebl.patch
|
5 | 5 |
0009-add-batik-all.jar.patch
|
|
6 |
fix_ftbfs.patch
|