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

Merge "Omaha #2536 fix TAF period clone issue" into omaha_14.4.1

Browse source 
Former-commit-id: 1954b5563c [formerly 3f123f16c8] [formerly 093e77d30b [formerly 73ea1df289595c7a54995f8af2014600ad573ed5]]
Former-commit-id: 093e77d30b
Former-commit-id: 9be5b1cf80
This commit is contained in:
Nate Jensen 2014-05-15 16:25:45 -05:00 • committed by Gerrit Code Review
commit 21cfa56f0c
5 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafPeriod.java
View file

@ -115,10 +115,11 @@ public class TafPeriod implements Serializable {
*/
public static TafPeriod copy(TafPeriod period) {
TafPeriod periodCopy = new TafPeriod();
periodCopy.startDate = (Calendar) period.startDate.clone();
periodCopy.transitionEndDate = (Calendar) period.transitionEndDate
.clone();
periodCopy.endDate = (Calendar) period.endDate.clone();
/* these may be null */
periodCopy.startDate = TimeUtil.newCalendar(period.startDate);
periodCopy.transitionEndDate = TimeUtil
.newCalendar(period.transitionEndDate);
periodCopy.endDate = TimeUtil.newCalendar(period.endDate);
return periodCopy;
}

7
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/decoder/TAFChangeGroupFactory.java
View file

@ -583,12 +583,13 @@ public class TAFChangeGroupFactory {
period1 = group1.getTafChangePeriod();
period2 = group2.getTafChangePeriod();
period1.setEndDate((Calendar) period2.getStartDate()
.clone());
period1.setEndDate(TimeUtil.newCalendar(period2
.getStartDate()));
}
// The last group gets the TAF end datetime.
period2.setEndDate((Calendar) validPeriod.getEndDate().clone());
period2.setEndDate(TimeUtil.newCalendar(validPeriod
.getEndDate()));
}
record.setIssue_time(issueTime.getTime());

12
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/decoder/TAFParser.java
View file

@ -152,10 +152,10 @@ public class TAFParser {
int currGroup = 0;
for (String grp : tafGroups) {
Calendar cStart = (Calendar) validPeriod.getStartDate()
.clone();
Calendar cStop = (Calendar) validPeriod.getEndDate()
.clone();
Calendar cStart = TimeUtil.newCalendar(validPeriod
.getStartDate());
Calendar cStop = TimeUtil.newCalendar(validPeriod
.getEndDate());
TafPeriod tPeriod = new TafPeriod(cStart, cStop);
ChangeGroup group = new ChangeGroup(grp, tPeriod);
@ -194,8 +194,8 @@ public class TAFParser {
period1 = group1.getTafChangePeriod();
period2 = group2.getTafChangePeriod();
period1.setEndDate((Calendar) period2
.getStartDate().clone());
period1.setEndDate(TimeUtil.newCalendar(period2
.getStartDate()));
}
period2.setEndDate((Calendar) validPeriod.getEndDate()

7
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafPeriod.java
View file

@ -102,10 +102,9 @@ public class NcTafPeriod implements Serializable {
*/
public static NcTafPeriod copy(NcTafPeriod period) {
NcTafPeriod periodCopy = new NcTafPeriod();
periodCopy.startDate = (Calendar) period.startDate.clone();
periodCopy.transitionEndDate = (Calendar) period.transitionEndDate
.clone();
periodCopy.endDate = (Calendar) period.endDate.clone();
periodCopy.startDate = TimeUtil.newCalendar(period.startDate);
periodCopy.transitionEndDate = TimeUtil.newCalendar(period.transitionEndDate);
periodCopy.endDate = TimeUtil.newCalendar(period.endDate);
return periodCopy;
}

14
ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/src/gov/noaa/nws/ncep/edex/plugin/nctaf/decoder/NcTafChangeGroupFactory.java
View file

@ -527,12 +527,13 @@ public class NcTafChangeGroupFactory {
period1 = group1.getTafChangePeriod();
period2 = group2.getTafChangePeriod();
period1.setEndDate((Calendar) period2.getStartDate()
.clone());
period1.setEndDate(TimeUtil.newCalendar(period2
.getStartDate()));
}
// The last group gets the TAF end datetime.
period2.setEndDate((Calendar) validPeriod.getEndDate().clone());
period2.setEndDate(TimeUtil.newCalendar(validPeriod
.getEndDate()));
}
record.setIssue_time(issueTime.getTime());
@ -642,12 +643,13 @@ public class NcTafChangeGroupFactory {
period1 = group1.getTafChangePeriod();
period2 = group2.getTafChangePeriod();
period1.setEndDate((Calendar) period2.getStartDate()
.clone());
period1.setEndDate(TimeUtil.newCalendar(period2
.getStartDate()));
}
// The last group gets the TAF end datetime.
period2.setEndDate((Calendar) validPeriod.getEndDate().clone());
period2.setEndDate(TimeUtil.newCalendar(validPeriod
.getEndDate()));
}
record.setIssue_time(issueTime.getTime());