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

Merge "Omaha #4500 - Fix ZoneSelectorResource" into omaha_16.1.1

Browse source 
Former-commit-id: 08b7c625646ac16f4e6c4d182f5f74a205bf6d0c
This commit is contained in:
Richard Peter 2015-07-30 16:34:35 -05:00 • committed by Gerrit Code Review
commit 61ae308711
1 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
View file

@ -948,41 +948,42 @@ public class ZoneSelectorResource extends DbMapResource {
public List<String> getZoneNames() {
if (zoneData.isEmpty()) {
try {
StringBuilder query = new StringBuilder("SELECT ");
// add any additional columns
boolean hasEditArea = false;
if (resourceData.getColumns() != null) {
int count = 0;
for (ColumnDefinition column : resourceData.getColumns()) {
if (EDIT_AREA.equals(column.toString())) {
hasEditArea = true;
break;
if (count > 0) {
query.append(", ");
}
query.append(column);
count++;
}
}
if (hasEditArea) {
StringBuilder query = new StringBuilder("SELECT ");
query.append(EDIT_AREA);
query.append(" FROM ");
// add the geometry table
query.append(resourceData.getTable());
query.append(" FROM ");
// add the geometry table
query.append(resourceData.getTable());
// add any constraints
String[] constraints = resourceData.getConstraints();
if ((constraints != null) && (constraints.length > 0)) {
query.append(" WHERE ").append(
StringUtils.join(constraints, " AND "));
}
// add any constraints
String[] constraints = resourceData.getConstraints();
if ((constraints != null) && (constraints.length > 0)) {
query.append(" WHERE ").append(
StringUtils.join(constraints, " AND "));
}
query.append(';');
query.append(';');
QueryResult mappedResult = DirectDbQuery
.executeMappedQuery(query.toString(), "maps",
QueryLanguage.SQL);
QueryResult mappedResult = DirectDbQuery.executeMappedQuery(
query.toString(), "maps", QueryLanguage.SQL);
if (mappedResult.getColumnNames().containsKey("editarea")) {
for (int i = 0; i < mappedResult.getResultCount(); i++) {
String zoneName = (String) mappedResult
.getRowColumnValue(i, 0);
.getRowColumnValue(i, "editarea");
getZoneInfo(zoneName);
}
}