From ba61a21c103a685cc9f98c142ab62165ff64ec1a Mon Sep 17 00:00:00 2001 From: Ben Steffensmeier Date: Thu, 21 Feb 2013 16:25:15 -0600 Subject: [PATCH] Issue #1617 fixed vb sounding point selection for points which contain the word Point Former-commit-id: be95659d4a81ebb883c4633058ddb95883c64ca6 [formerly 1d8ad288b49d902e57aba11b426d1cbb22e4fd4b] [formerly be95659d4a81ebb883c4633058ddb95883c64ca6 [formerly 1d8ad288b49d902e57aba11b426d1cbb22e4fd4b] [formerly 5701309bcb70d49e21b5e1279d2a6c4c448f206d [formerly d2aa45b1fb765ae3f24d96b39b789195d5c607ed]]] Former-commit-id: 5701309bcb70d49e21b5e1279d2a6c4c448f206d Former-commit-id: 2892e64677a410334e0a34c01c40f75d4b263655 [formerly 7c0f1bf788f216e91ccece389304c3ed5bb93e77] Former-commit-id: 4dad2798e890c6732dcee2ff4469ebc1f85d11e7 --- .../volumebrowser/datacatalog/AbstractDataCatalog.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/AbstractDataCatalog.java b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/AbstractDataCatalog.java index 05416a32c6..350c8ee3dd 100644 --- a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/AbstractDataCatalog.java +++ b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/AbstractDataCatalog.java @@ -27,6 +27,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.regex.Pattern; import com.raytheon.uf.common.dataplugin.level.Level; import com.raytheon.uf.common.dataquery.requests.RequestConstraint; @@ -73,6 +74,8 @@ import com.vividsolutions.jts.geom.Coordinate; * 10-21-09 #1711 bsteffen Updated Baseline and Points to use new ToolsDataManager * 01/30/2012 DR 14308 D.Friedman Use correct style for arrow types. * 07/31/2012 #875 rferrel Now uses points. + * Feb 21, 2013 1617 bsteffen fixed vb sounding point selection for + * points which contain the word Point * * * @@ -91,6 +94,8 @@ public abstract class AbstractDataCatalog implements IDataCatalog { /** key representing all point and line planes **/ public static final String POINT_LINE_KEY = "PointLine"; + public static final Pattern POINT_PATTERN = Pattern.compile("^Point"); + /** * * @return a list of plugin Names used for the given setting @@ -274,8 +279,9 @@ public abstract class AbstractDataCatalog implements IDataCatalog { case VARVSHGT: case CROSSSECTION: case SOUNDING: - pointLetter = catalogEntry.getSelectedData().getPlanesKey() - .replace("Point", ""); + pointLetter = POINT_PATTERN.matcher( + catalogEntry.getSelectedData().getPlanesKey()) + .replaceFirst(""); break; case TIMESERIES: pointLetter = catalogEntry.getDialogSettings().getPointsSelection()