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

Issue #562: Rename QPFRecord getters and setters to match Java-naming

Browse source 
conventions, correct bugs in other classes found during test.

Change-Id: I7f490793678741ffa41769a63371e06d27840bdb

Former-commit-id: 6497272c1d [formerly c28bfaddee] [formerly 6497272c1d [formerly c28bfaddee] [formerly 292374ce21 [formerly fe6ec52b4cf64d410f3de609b06cf9666a5936bc]]]
Former-commit-id: 292374ce21
Former-commit-id: 1107eac65d [formerly 6f40ba77f1]
Former-commit-id: 01f74fa2b5
This commit is contained in:
David Gillingham 2012-04-27 12:38:13 -05:00
parent 84d7341a01
commit 64df9d3b46
4 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/test/ScanTestDataPopulator.java
View file

@ -11,6 +11,8 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.concurrent.ConcurrentHashMap;
import com.raytheon.uf.common.util.FileUtil;
/**
* Utility to populate EDEX with Data for DAT tools
*
@ -281,7 +283,8 @@ public class ScanTestDataPopulator {
*/
private void copyFile(File file) {
File outfile = new File(MANUAL_INGEST_DIR + "/scanTestDataPopulator/" + file.getName());
File outfile = new File(FileUtil.join(MANUAL_INGEST_DIR,
file.getName()));
InputStream in = null;
try {
in = new FileInputStream(file);

10
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/DiscoverMenuContributions.java
View file

@ -54,7 +54,6 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.localization.LocalizationConstants;
import com.raytheon.uf.viz.core.localization.LocalizationManager;
import com.raytheon.uf.viz.ui.menus.xml.IncludeMenuItem;
@ -76,6 +75,9 @@ import com.raytheon.uf.viz.ui.menus.xml.IncludeMenuItem;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 12, 2009 chammack Initial creation
* Apr 27, 2012 #562 dgilling Ensure call to MenuCreationJob
* uses proper method to retrieve
* localized site.
*
* </pre>
*
@ -105,13 +107,13 @@ public class DiscoverMenuContributions {
public static synchronized void discoverContributions(
final String[] menuArray, boolean scheduleJob) {
if (ran)
if (ran) {
return;
}
if (scheduleJob) {
MenuCreationJob job = new MenuCreationJob(LocalizationManager
.getInstance().getLocalizationStore()
.getString(LocalizationConstants.P_LOCALIZATION_SITE_NAME));
.getInstance().getSite());
job.schedule();
try {

18
edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
View file

@ -60,6 +60,8 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 2/24/09 2027 D. Hladky Initial release
* 4/27/12 #562 dgilling Rename getters/setters to
* match Java conventions.
*
* </pre>
*
@ -335,7 +337,7 @@ public class QPFRecord extends ServerSpecificPersistablePluginDataObject
*
* @param ew_velocity
*/
public void setEWVelocity(Float ewvelocity) {
public void setEwvelocity(Float ewvelocity) {
this.ewvelocity = ewvelocity;
}
@ -344,7 +346,7 @@ public class QPFRecord extends ServerSpecificPersistablePluginDataObject
*
* @return
*/
public Float getEWVelocity() {
public Float getEwvelocity() {
return ewvelocity;
}
@ -353,7 +355,7 @@ public class QPFRecord extends ServerSpecificPersistablePluginDataObject
*
* @param ns_velocity
*/
public void setNSVelocity(Float nsvelocity) {
public void setNsvelocity(Float nsvelocity) {
this.nsvelocity = nsvelocity;
}
@ -362,7 +364,7 @@ public class QPFRecord extends ServerSpecificPersistablePluginDataObject
*
* @return
*/
public Float getNSVelocity() {
public Float getNsvelocity() {
return nsvelocity;
}
@ -371,7 +373,7 @@ public class QPFRecord extends ServerSpecificPersistablePluginDataObject
*
* @param avg_spd
*/
public void setAVGSpd(Float avgspd) {
public void setAvgspd(Float avgspd) {
this.avgspd = avgspd;
}
@ -380,7 +382,7 @@ public class QPFRecord extends ServerSpecificPersistablePluginDataObject
*
* @return
*/
public Float getAVGSpd() {
public Float getAvgspd() {
return avgspd;
}
@ -389,7 +391,7 @@ public class QPFRecord extends ServerSpecificPersistablePluginDataObject
*
* @param avg_dir
*/
public void setAVGDir(Float avgdir) {
public void setAvgdir(Float avgdir) {
this.avgdir = avgdir;
}
@ -398,7 +400,7 @@ public class QPFRecord extends ServerSpecificPersistablePluginDataObject
*
* @return
*/
public Float getAVGDir() {
public Float getAvgdir() {
return avgdir;
}

10
edexOsgi/com.raytheon.uf.edex.plugin.qpf/src/com/raytheon/uf/edex/plugin/qpf/QPFGenerator.java
View file

@ -47,6 +47,8 @@ import com.raytheon.uf.edex.plugin.qpf.common.QPFConfig;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 02/07/2009 1981 dhladky Initial Creation.
* 04/27/2012 #562 dgilling Accept getter and setter
* renames in QPFRecord.
*
* </pre>
*
@ -126,10 +128,10 @@ public class QPFGenerator extends CompositeProductGenerator {
QPFRecord qpfRec = new QPFRecord();
qpfRec.setNx(qpf_config.getCurrentVil().getNumBins());
qpfRec.setNy(qpf_config.getCurrentVil().getNumRadials());
qpfRec.setEWVelocity(qpf.getWEVelocity());
qpfRec.setNSVelocity(qpf.getRNSVelocity());
qpfRec.setAVGSpd(qpf.getAVGSpd());
qpfRec.setAVGDir(qpf.getAVGDir());
qpfRec.setEwvelocity(qpf.getWEVelocity());
qpfRec.setNsvelocity(qpf.getRNSVelocity());
qpfRec.setAvgspd(qpf.getAVGSpd());
qpfRec.setAvgdir(qpf.getAVGDir());
if (qpf_config.getCurrentVil().getNumBins() == ScanUtils.SCAN_GRID_DIM) {
qpfRec.setDx(ScanUtils.SCAN_GRID_DIM_RESOLUTION);