From 25f3ac4b786a721102c952b2fd7eff0fb2848b6e Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Tue, 14 Jun 2005 13:58:48 +0000
Subject: [PATCH] fix for colours
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@2854 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
uk/ac/sanger/artemis/Options.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/uk/ac/sanger/artemis/Options.java b/uk/ac/sanger/artemis/Options.java
index 341466364..30bd653ad 100644
--- a/uk/ac/sanger/artemis/Options.java
+++ b/uk/ac/sanger/artemis/Options.java
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/Options.java,v 1.4 2004-11-17 13:20:46 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/Options.java,v 1.5 2005-06-14 13:58:48 tjc Exp $
**/
package uk.ac.sanger.artemis;
@@ -44,7 +44,7 @@ import java.util.*;
* read in new options.
*
* @author Kim Rutherford
- * @version $Id: Options.java,v 1.4 2004-11-17 13:20:46 tjc Exp $
+ * @version $Id: Options.java,v 1.5 2005-06-14 13:58:48 tjc Exp $
**/
public class Options extends Properties
@@ -582,8 +582,14 @@ public class Options extends Properties
if(colour_number >= colour_map.size() ||
colour_map.elementAt(colour_number) == null)
+ {
+ String col = getProperty("colour_" + colour_number);
+ if(col != null)
+ return parseColour(col);
+
// there is no colour for this colour_number
return null;
+ }
else
return (Color) colour_map.elementAt(colour_number);
}
--
GitLab