From 4e15abd3ac95d7c17c192f97bf1458450316d332 Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Fri, 18 Jun 2010 14:45:34 +0000
Subject: [PATCH] look for mapping files on the classpath before looking in
/etc
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@14075 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
.../artemis/io/PublicDBDocumentEntry.java | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/uk/ac/sanger/artemis/io/PublicDBDocumentEntry.java b/uk/ac/sanger/artemis/io/PublicDBDocumentEntry.java
index e7c8df34d..50f3ae163 100644
--- a/uk/ac/sanger/artemis/io/PublicDBDocumentEntry.java
+++ b/uk/ac/sanger/artemis/io/PublicDBDocumentEntry.java
@@ -632,11 +632,18 @@ public class PublicDBDocumentEntry extends SimpleDocumentEntry
**/
private static void initDatabaseMappings()
{
- final InputStream keyStream =
- Options.class.getResourceAsStream("/etc/key_mapping");
- final InputStream qualifierStream =
- Options.class.getResourceAsStream("/etc/qualifier_mapping");
-
+ InputStream keyStream =
+ Options.class.getResourceAsStream("/key_mapping");
+ if (keyStream == null)
+ keyStream =
+ Options.class.getResourceAsStream("/etc/key_mapping");
+
+ InputStream qualifierStream =
+ Options.class.getResourceAsStream("/qualifier_mapping");
+ if (qualifierStream == null)
+ qualifierStream =
+ Options.class.getResourceAsStream("/etc/qualifier_mapping");
+
final Properties keyMapProperties = new Properties();
final Properties qualifierMapProperties = new Properties();
try
--
GitLab