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

Merge "Omaha #3502 common.util changes" into omaha_14.4.1

Browse source 
Former-commit-id: 8078d38356 [formerly a848bb1819] [formerly cf9f83502d] [formerly cf9f83502d [formerly 30e4033081]] [formerly 8078d38356 [formerly a848bb1819] [formerly cf9f83502d] [formerly cf9f83502d [formerly 30e4033081]] [formerly ddf406d1fd [formerly cf9f83502d [formerly 30e4033081] [formerly ddf406d1fd [formerly ba40f480460358435192de6c8aad771b10682eaa]]]]]
Former-commit-id: ddf406d1fd
Former-commit-id: 95895e96eb [formerly 3f3d19dd42] [formerly 9be6d6b0b9] [formerly 2774568d934654e89cc8b35a537a125f37bd0959 [formerly a941aedfaf556071c5dabf1e566d37bd2c46c67b] [formerly 9be6d6b0b9 [formerly f66e1f101e]]]
Former-commit-id: eca2f77a93b486fb1a89b7d59b83173877b22f43 [formerly c55e18da595b01744d56f120419767c1ed687448] [formerly a33705144d [formerly 8dbe531164]]
Former-commit-id: a73a71b4c81a90849546158493a1fe0070fe0e72 [formerly a33705144d]
Former-commit-id: 4d4ebb79fb
This commit is contained in:
Richard Peter 2014-08-08 18:05:06 -05:00 • committed by Gerrit Code Review
commit 40e25ce994
6 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/monitor/SiteMonitor.java
View file

@ -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()
*
* </pre>
*
@ -152,7 +153,7 @@ public class SiteMonitor implements IRequestCompleteListener<Map<?, ?>> {
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<Map<?, ?>> {
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

5
cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/AvnConfiguration.java
View file

@ -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()
*
* </pre>
*
@ -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++) {

3
cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/DataSourceTabComp.java
View file

@ -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()
*
* </pre>
*
@ -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(

2
edexOsgi/com.raytheon.uf.edex.gridcoverage/res/spring/gridcoverage-common.xml
View file

@ -30,7 +30,7 @@
<constructor-arg ref="gridcoverageProperties" />
</bean>
<bean class="com.raytheon.uf.common.util.ConvertUtil" factory-method="registerConverter">
<bean class="com.raytheon.uf.common.convert.ConvertUtil" factory-method="registerConverter">
<constructor-arg><bean class="com.raytheon.uf.common.gridcoverage.convert.GridCoverageConverter"/></constructor-arg>
<constructor-arg><value>com.raytheon.uf.common.gridcoverage.GridCoverage</value></constructor-arg>
</bean>

3
edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF
View file

@ -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

3
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/util/DefaultConverter.java
View file

@ -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