From 62f529ebe2eb24647c99e0dab18f5b1013860566 Mon Sep 17 00:00:00 2001 From: Brian Clements Date: Thu, 7 Aug 2014 16:03:37 -0500 Subject: [PATCH] Omaha #3502 common.util changes moved ConvertUtil, reworked StringUtil.split() Change-Id: I82114f8a9ec7fb907c85258a070169dcba61be03 Former-commit-id: c3e1b5c9a272e247ae2429eb631b87095aede4c4 [formerly c3e1b5c9a272e247ae2429eb631b87095aede4c4 [formerly 72b5092e87e71f78fa35065dfc8bcb8e746f67b8]] Former-commit-id: fc322a74b275d5061b49f5ce51f53a20e0bb817c Former-commit-id: fa89fae5295bbe355a5db6efd45fe980907d34d0 --- .../src/com/raytheon/viz/aviation/monitor/SiteMonitor.java | 5 +++-- .../src/com/raytheon/viz/avnconfig/AvnConfiguration.java | 5 +++-- .../src/com/raytheon/viz/avnconfig/DataSourceTabComp.java | 3 ++- .../res/spring/gridcoverage-common.xml | 2 +- .../com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF | 3 ++- .../raytheon/uf/edex/ogc/common/util/DefaultConverter.java | 3 ++- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/monitor/SiteMonitor.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/monitor/SiteMonitor.java index e6e7ad7d7a..3f55b51661 100644 --- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/monitor/SiteMonitor.java +++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/monitor/SiteMonitor.java @@ -66,6 +66,7 @@ import com.raytheon.viz.aviation.xml.MonitorCfg; * 11AUG2012 14570 zhao Added 'cat' to alert_key_map * 02Jan2013 15606 gzhang Remove GridData widthHint so button/label size change with GUI * May 15, 2014 3002 bgonzale Moved common taf code to com.raytheon.uf.common.dataplugin.taf. + * Aug 07, 2014 3502 bclement changes to StringUtil.split() * * * @@ -152,7 +153,7 @@ public class SiteMonitor implements IRequestCompleteListener> { this.alertMap = alertMap; this.tempoMap = tempoMap;//20120711 this.alertTimeMap = alertTimeMap;// DR 14570 - monitorItems = StringUtil.split(cfg.getMonitorItems(), ","); + monitorItems = StringUtil.split(cfg.getMonitorItems(), ','); initMonitorLabels(cfg.getMonitorLabels()); Composite controlComposite = createControlComposite(); @@ -185,7 +186,7 @@ public class SiteMonitor implements IRequestCompleteListener> { if (monitorLabelsStr != null) { // This trims entries of leading & trailing whitespaces. - String[] tmpLabels = StringUtil.split(monitorLabelsStr, ","); + String[] tmpLabels = StringUtil.split(monitorLabelsStr, ','); /* * Find the smallest array size between the tmpLabels (parsed diff --git a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/AvnConfiguration.java b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/AvnConfiguration.java index f1144195ef..fb75132faf 100644 --- a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/AvnConfiguration.java +++ b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/AvnConfiguration.java @@ -60,6 +60,7 @@ import com.raytheon.viz.avnconfig.AvnConfigConstants.RuleType; * commas in the text. * Sep 27, 2011 10958 rferrel Added checks for required fields in * configuration files. + * Aug 07, 2014 3502 bclement changes to StringUtil.split() * * * @@ -360,7 +361,7 @@ public class AvnConfiguration { } String[] activeRules = StringUtil.split( - config.getString("rules.active"), ","); + config.getString("rules.active"), ','); for (String activeRule : activeRules) { String key = "rule_" + activeRule; @@ -473,7 +474,7 @@ public class AvnConfiguration { if (arg.equalsIgnoreCase("wx")) { String[] argValues = StringUtil.split( - config.getString(argKey), ","); + config.getString(argKey), ','); StringBuffer argBuffer = new StringBuffer(); for (int j = 0; j < argValues.length; j++) { diff --git a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/DataSourceTabComp.java b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/DataSourceTabComp.java index e690e5edd3..0e659e1511 100644 --- a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/DataSourceTabComp.java +++ b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/DataSourceTabComp.java @@ -69,6 +69,7 @@ import com.raytheon.viz.avnconfig.AvnConfigConstants.RuleType; * 29 OCT 2010 7262 rferrel Realigned columns for wider method * names. * 09 NOV 2011 8865 rferrel Fixed selection of Edit Buttons. + * Aug 07, 2014 3502 bclement changes to StringUtil.split() * * * @@ -233,7 +234,7 @@ public class DataSourceTabComp extends Composite implements .getStaticFile("aviation/config/gui/SyntaxMonitorCfg.xml"); syntaxMonCfg = JAXB.unmarshal(path, SyntaxMonitorCfg.class); String colors = syntaxMonCfg.getMonitorColors(); - severityColors = StringUtil.split(colors, ","); + severityColors = StringUtil.split(colors, ','); if (severityColors.length < 3) { throw new ConfigurationException( String.format( diff --git a/edexOsgi/com.raytheon.uf.edex.gridcoverage/res/spring/gridcoverage-common.xml b/edexOsgi/com.raytheon.uf.edex.gridcoverage/res/spring/gridcoverage-common.xml index 7527b73204..9fc1daf21c 100644 --- a/edexOsgi/com.raytheon.uf.edex.gridcoverage/res/spring/gridcoverage-common.xml +++ b/edexOsgi/com.raytheon.uf.edex.gridcoverage/res/spring/gridcoverage-common.xml @@ -30,7 +30,7 @@ - + com.raytheon.uf.common.gridcoverage.GridCoverage diff --git a/edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF index 1baf89db9c..48a991eb55 100644 --- a/edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF @@ -41,7 +41,8 @@ Export-Package: com.raytheon.uf.edex.ogc.common, com.raytheon.uf.edex.ogc.common.stats, com.raytheon.uf.edex.ogc.common.time, com.raytheon.uf.edex.ogc.common.util -Import-Package: com.raytheon.uf.common.localization, +Import-Package: com.raytheon.uf.common.convert, + com.raytheon.uf.common.localization, javax.servlet, javax.servlet.http, org.apache.cxf.helpers diff --git a/edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/util/DefaultConverter.java b/edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/util/DefaultConverter.java index 5ed74f74f8..a500505e00 100644 --- a/edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/util/DefaultConverter.java +++ b/edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/util/DefaultConverter.java @@ -11,7 +11,8 @@ package com.raytheon.uf.edex.ogc.common.util; import java.lang.reflect.Field; -import com.raytheon.uf.common.util.ConvertUtil; +import com.raytheon.uf.common.convert.ConvertUtil; + /** * Converter that uses convertUtil