From f606fdb839d6b61dfab4e7745266a2ca713bdd7e Mon Sep 17 00:00:00 2001
From: "Qinglu.Lin" <Qinglu.Lin@noaa.gov>
Date: Thu, 9 Jan 2014 14:12:25 -0500
Subject: [PATCH] Issue #123

Change-Id: Iac88a9d04fce04b4f604fb3d29c6591c90d85a65

Former-commit-id: e52d03fd37bae1816c37000c62e2ef2a7e29cd42 [formerly 1c2b48a66e1f2db335a9a650a77ea299a7004729] [formerly 14e34361db8ef79195b5234a384a9e90f69f0f7c [formerly bbd87416db31892d00960da0d9076e265578dd43]]
Former-commit-id: 14e34361db8ef79195b5234a384a9e90f69f0f7c
Former-commit-id: 1aba68221a5e5d2cf54a0ea486acb04db98204d9
---
 .../src/com/raytheon/viz/warngen/text/ICommonPatterns.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
index 646c798cbd..8ed46d80fe 100644
--- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
+++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
@@ -34,6 +34,10 @@ import java.util.regex.Pattern;
  * Oct 18, 2012   15332    jsanchez     Replaced listOfAreaNamesPtrn with String pattern.
  * Mar 13, 2013  DR 15892  D. Friedman  Allow some punctuation in area names.
  * Apr 18, 2013  DR 16055  D. Friedman  Allow more than one contiguous space in areas.
+ * Jan  6, 2014  DR 16627  Qinglu Lin   Updated listOfAreaName to get county name list locked when county abbreviation 
+ *                                      is dropped, a name has more than one word, two names are separated by slash (/), 
+ *                                      or a name has an apostrophe (') for Significant Weather Advisory, Special Weather 
+ *                                      Statement, and Short Term Forecast.
  * 
  * </pre>
  * 
@@ -57,7 +61,7 @@ public interface ICommonPatterns {
     // LOCK_END can be added at the start of the line if a previous line has
     // been locked.
     public static final String listOfAreaName = "^((" + LOCK_END
-            + "){0,1}((([\\?\\(\\)\\w\\.,/'-]+\\s{1,})+\\w{2}-)*(([\\?\\(\\)\\w\\.,/'-]+\\s{1,})+\\w{2}-)))";
+            + "){0,1}((([\\?\\(\\)\\w\\.,/'-])+(\\s{1,}\\w{2}){0,1}(\\s{1,}\\w{1,}([\\/\\']\\w{0,}\\s{0,}\\w{0,}){0,}){0,}-)*))";
 
     // LOCK_END should not be found at the beginning of a first bullet since the
     // previous line should be blank.