X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FRnamlFile.java;fp=src%2Fjalview%2Fio%2FRnamlFile.java;h=4d3ddc17241ba7cdd0b60123fd438e363efcc4a2;hb=4f77328104498504339216829abf5ea87e2791ec;hp=d5a8d81805906bdae0c55cf5cd7645829efc725e;hpb=2b8c0785318a3528e1876e8e2dd48b7d831eae69;p=jalview.git diff --git a/src/jalview/io/RnamlFile.java b/src/jalview/io/RnamlFile.java index d5a8d81..4d3ddc1 100644 --- a/src/jalview/io/RnamlFile.java +++ b/src/jalview/io/RnamlFile.java @@ -26,7 +26,6 @@ import jalview.datamodel.Annotation; import jalview.datamodel.Sequence; import jalview.datamodel.SequenceI; import jalview.util.MessageManager; -import jalview.util.Platform; import java.io.BufferedReader; import java.io.FileNotFoundException; @@ -228,7 +227,7 @@ public class RnamlFile extends AlignFile dataName = dataName.substring(0, b - 1); } b = 0; - Regex m = getSafeRegex(); + Regex m = new Regex("[\\/]?([-A-Za-z0-9]+)\\.?"); String mm = dataName; while (m.searchFrom(dataName, b)) { @@ -237,13 +236,4 @@ public class RnamlFile extends AlignFile } return mm; } - - private static Regex SAFE_REGEX; - - private static Regex getSafeRegex() - { - return (SAFE_REGEX == null - ? SAFE_REGEX = Platform.newRegex("[\\/]?([-A-Za-z0-9]+)\\.?", null) - : SAFE_REGEX); - } }