X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FRnamlFile.java;h=d5a8d81805906bdae0c55cf5cd7645829efc725e;hb=72fb6df14f1ff426bbafa18dcc9a90450da93018;hp=4d3ddc17241ba7cdd0b60123fd438e363efcc4a2;hpb=f4766a7bbcfae845fc95923b01fa14ff83d589ff;p=jalview.git diff --git a/src/jalview/io/RnamlFile.java b/src/jalview/io/RnamlFile.java index 4d3ddc1..d5a8d81 100644 --- a/src/jalview/io/RnamlFile.java +++ b/src/jalview/io/RnamlFile.java @@ -26,6 +26,7 @@ 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; @@ -227,7 +228,7 @@ public class RnamlFile extends AlignFile dataName = dataName.substring(0, b - 1); } b = 0; - Regex m = new Regex("[\\/]?([-A-Za-z0-9]+)\\.?"); + Regex m = getSafeRegex(); String mm = dataName; while (m.searchFrom(dataName, b)) { @@ -236,4 +237,13 @@ 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); + } }