From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 14 Jun 2016 11:31:34 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~179^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1b464022dd7d919df66738a517b3b46f8126ad98;hp=7271c53b93e7834da8e86fc0a4d7b7fb57f5a9d7;p=jalview.git

Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
---

diff --git a/src/jalview/util/DnaUtils.java b/src/jalview/util/DnaUtils.java
index f6514e5..9ab4fda 100644
--- a/src/jalview/util/DnaUtils.java
+++ b/src/jalview/util/DnaUtils.java
@@ -35,15 +35,14 @@ public class DnaUtils
 
     /*
      * try to parse m..n (or simply m)
-     * also handles <m..n or m..>n (discarding < or >)
      */
     String[] range = location.split("\\.\\.");
     if (range.length == 1 || range.length == 2)
     {
       try
       {
-        int start = parseRangeEnd(range[0]);
-        int end = range.length == 1 ? start : parseRangeEnd(range[1]);
+        int start = Integer.valueOf(range[0]);
+        int end = range.length == 1 ? start : Integer.valueOf(range[1]);
         return Collections.singletonList(new int[] { start, end });
       } catch (NumberFormatException e)
       {
@@ -65,22 +64,6 @@ public class DnaUtils
   }
 
   /**
-   * Returns the integer value of a locus, discarding any < or > prefix
-   * 
-   * @throws NumberFormatException
-   *           if value is not numeric
-   */
-  static int parseRangeEnd(String loc)
-  {
-
-    if (loc.startsWith("<") || loc.startsWith(">"))
-    {
-      loc = loc.substring(1);
-    }
-    return Integer.valueOf(loc);
-  }
-
-  /**
    * Parses a complement(locationSpec) into a list of start-end ranges
    * 
    * @param location