xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #1617 fixed vb sounding point selection for points which contain the word Point" into development

Browse source 
Former-commit-id: b514792bbc [formerly b514792bbc [formerly 1fec56c55d81b35df45c2266fc234747df3791df]]
Former-commit-id: 5d828d4d62
Former-commit-id: cb37bab362
This commit is contained in:
Nate Jensen 2013-02-25 09:31:55 -06:00 • committed by Gerrit Code Review
commit df183bb4da
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/AbstractDataCatalog.java
View file

@ -27,6 +27,7 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.regex.Pattern;
import com.raytheon.uf.common.dataplugin.level.Level; import com.raytheon.uf.common.dataplugin.level.Level;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint; 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 * 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. * 01/30/2012 DR 14308 D.Friedman Use correct style for arrow types.
* 07/31/2012 #875 rferrel Now uses points. * 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
* *
* *
* </pre> * </pre>
@ -91,6 +94,8 @@ public abstract class AbstractDataCatalog implements IDataCatalog {
/** key representing all point and line planes **/ /** key representing all point and line planes **/
public static final String POINT_LINE_KEY = "PointLine"; 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 * @return a list of plugin Names used for the given setting
@ -274,8 +279,9 @@ public abstract class AbstractDataCatalog implements IDataCatalog {
case VARVSHGT: case VARVSHGT:
case CROSSSECTION: case CROSSSECTION:
case SOUNDING: case SOUNDING:
pointLetter = catalogEntry.getSelectedData().getPlanesKey() pointLetter = POINT_PATTERN.matcher(
.replace("Point", ""); catalogEntry.getSelectedData().getPlanesKey())
.replaceFirst("");
break; break;
case TIMESERIES: case TIMESERIES:
pointLetter = catalogEntry.getDialogSettings().getPointsSelection() pointLetter = catalogEntry.getDialogSettings().getPointsSelection()