From 689060dcf60cf044087e6ca83a5312c8bac16473 Mon Sep 17 00:00:00 2001 From: kjvdheide Date: Sat, 6 Jan 2018 22:11:18 +0000 Subject: [PATCH] JAL-2871 aptx Configuration now created through input stream --- forester | 2 +- src/jalview/ext/archaeopteryx/AptxInit.java | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/forester b/forester index 3d5864a..38161fc 160000 --- a/forester +++ b/forester @@ -1 +1 @@ -Subproject commit 3d5864a39739960c126f2ab5585162fd52d1f47d +Subproject commit 38161fcaf592e9a233b87c80b68029c6eb247638 diff --git a/src/jalview/ext/archaeopteryx/AptxInit.java b/src/jalview/ext/archaeopteryx/AptxInit.java index be0a1fe..0337829 100644 --- a/src/jalview/ext/archaeopteryx/AptxInit.java +++ b/src/jalview/ext/archaeopteryx/AptxInit.java @@ -16,6 +16,7 @@ import jalview.viewmodel.AlignmentViewport; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; @@ -44,9 +45,13 @@ import org.forester.util.ForesterUtil; */ public final class AptxInit { + public final static InputStream CONFIG_LOC = AptxInit.class + + .getResourceAsStream("/_aptx_jalview_configuration_file.txt"); + public final static Configuration APTX_CONFIG = new Configuration( - "resources/_aptx_jalview_configuration_file", false, false, - false); + CONFIG_LOC, + false, false); // static // { // APTX_CONFIG.setBaseFontFamilyName( -- 1.7.10.2