From ee04b05bd551cce3e0ec2c2340a7d2cfbc320ea4 Mon Sep 17 00:00:00 2001 From: Michael Gamazaychikov Date: Tue, 2 Dec 2014 10:27:40 -0500 Subject: [PATCH] ASM #643 - Text Workstation mishandles editing WRK products with numbers in PIL. Change-Id: I493c457a45640a820fabaa5c8a4aa0ecc3e23e53 Former-commit-id: 81066e798575e02bf6ae6045d987eae4871f353e [formerly 4c2f49e3cc961ff8d02a42bac0f31f9c31973782] Former-commit-id: 0444ccbb1780832f56bb22d05b28edc099e67d1a --- .../src/com/raytheon/viz/texteditor/TextDisplayModel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/TextDisplayModel.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/TextDisplayModel.java index 21ac58aa52..84e1fe4a2f 100644 --- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/TextDisplayModel.java +++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/TextDisplayModel.java @@ -64,6 +64,7 @@ import com.raytheon.viz.texteditor.msgs.ITextWorkstationCallback; * dependency * 05/28/2010 2187 cjeanbap Added StdTextProductFactory functionality. * 03/18/2014 DR 17174 D. Friedman Return correct 3-letter site IDs in getNnnXxx. + * 12/02/2014 DR 643 mgamazaychikov Change nnnxxxPattern to allow for numbers in nnnxxx. * * * @author grichard @@ -83,7 +84,7 @@ public final class TextDisplayModel { .compile("/[A-Z]\\.([A-Z]{3})\\.(\\p{Alnum}{4})\\.([A-Z]{2}\\.[A-Z]{1})"); private static final Pattern nnnxxxPattern = Pattern - .compile("[\\r\\n]+([A-Z]{3})([A-Z]{3})(| WRKWG[0-9])[\\r\\n]+"); + .compile("[\\r\\n]+([A-Z0-9]{3})([A-Z0-9]{3})(| WRKWG[0-9])[\\r\\n]+"); /** * The static singleton instance.