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

Merge branch 'ss_builds' (12.11.1-1) into development

Browse source 
Conflicts:
	cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/FileTreeView.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/CaveJFACEDialog.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/WorldWrapCorrector.java

Former-commit-id: 71d20876d7 [formerly 71d20876d7 [formerly def4028b46f9e82ddcfbee02f2a2b3e97f666c97]]
Former-commit-id: 638fbaf0d3
Former-commit-id: aa3123e81a
This commit is contained in:
Steven Harris 2012-09-27 16:26:06 -05:00
commit 432b0f25ba
3 changed files with 73 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
cave/com.raytheon.viz.localization/src/com/raytheon/uf/viz/localization/filetreeview/FileTreeEntryData.java
View file

@ -149,4 +149,46 @@ public class FileTreeEntryData {
return true;
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#hashCode()
*/
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((path == null) ? 0 : path.hashCode());
result = prime * result
+ ((pathData == null) ? 0 : pathData.hashCode());
return result;
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
FileTreeEntryData other = (FileTreeEntryData) obj;
if (path == null) {
if (other.path != null)
return false;
} else if (!path.equals(other.path))
return false;
if (pathData == null) {
if (other.pathData != null)
return false;
} else if (!pathData.equals(other.pathData))
return false;
return true;
}
}

16
edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/AbstractBUFRUAAdapter.java
View file

@ -49,8 +49,6 @@ import com.raytheon.uf.edex.wmo.message.WMOHeader;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 20080303 969 jkorman Initial implementation.
* 2012-09-07 DR 15316 M. Porricelli Removed adjustment of
* valid time hour
*
* </pre>
*
@ -62,10 +60,10 @@ public abstract class AbstractBUFRUAAdapter extends BUFRPointDataAdapter<UAObs>
// Allowable future time in milliseconds (2 hours).
private static final long ALLOWABLE_TIME = 2 * 3600 * 1000;
// private static final int[] HOUR_MAP = {
// // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
// 0, -1, -2, -3, 2, 1, 0, -1, -2, -3, 2, 1, 0, -1, -2, -3, 2, 1, 0,
// -1, -2, -3, 2, 1 };
private static final int[] HOUR_MAP = {
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
0, -1, -2, -3, 2, 1, 0, -1, -2, -3, 2, 1, 0, -1, -2, -3, 2, 1, 0,
-1, -2, -3, 2, 1 };
private static final int YEAR_POS = 4;
@ -117,9 +115,9 @@ public abstract class AbstractBUFRUAAdapter extends BUFRPointDataAdapter<UAObs>
Calendar relTime = TimeTools.copy(validTime);
// // Now offset the "record" validTime using the hour mapping.
// int hour = validTime.get(Calendar.HOUR_OF_DAY);
// validTime.add(Calendar.HOUR_OF_DAY, HOUR_MAP[hour]);
// Now offset the "record" validTime using the hour mapping.
int hour = validTime.get(Calendar.HOUR_OF_DAY);
validTime.add(Calendar.HOUR_OF_DAY, HOUR_MAP[hour]);
// Set the new validTime back into the UAObs record.
obsData.setValidTime(validTime);

46
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
View file

@ -71,6 +71,7 @@ import com.raytheon.uf.edex.core.EDEXUtil;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Aug 12, 2011 dgilling Initial creation
* Sep 19, 2012 jdynina DR 15442 fix
*
* </pre>
*
@ -178,30 +179,31 @@ public class GfeIngestNotificationFilter {
}
}
}
for (ParmID parmId : gridInv.keySet()) {
Map<TimeRange, List<GridDataHistory>> hist = new HashMap<TimeRange, List<GridDataHistory>>();
try {
List<TimeRange> trs = gridInv.get(parmId);
Collections.sort(trs);
for (TimeRange time : trs) {
List<GridDataHistory> histList = new ArrayList<GridDataHistory>();
histList.add(new GridDataHistory(
GridDataHistory.OriginType.INITIALIZED,
parmId, time, null, (WsId) null));
hist.put(time, histList);
}
guns.add(new GridUpdateNotification(parmId,
new TimeRange(trs.get(0).getStart(), trs.get(
trs.size() - 1).getEnd()), hist, null,
parmId.getDbId().getSiteId()));
} catch (Exception e) {
handler.error("Unable to retrieve grid history for "
+ parmId.toString(), e);
}
}
}
// DR 15442 - move last for loop out of the for loop at line 110
for (ParmID parmId : gridInv.keySet()) {
Map<TimeRange, List<GridDataHistory>> hist = new HashMap<TimeRange, List<GridDataHistory>>();
try {
List<TimeRange> trs = gridInv.get(parmId);
Collections.sort(trs);
for (TimeRange time : trs) {
List<GridDataHistory> histList = new ArrayList<GridDataHistory>();
histList.add(new GridDataHistory(
GridDataHistory.OriginType.INITIALIZED,
parmId, time, null, (WsId) null));
hist.put(time, histList);
}
guns.add(new GridUpdateNotification(parmId,
new TimeRange(trs.get(0).getStart(), trs.get(
trs.size() - 1).getEnd()), hist, null,
parmId.getDbId().getSiteId()));
} catch (Exception e) {
handler.error("Unable to retrieve grid history for "
+ parmId.toString(), e);
}
}
try {
sendNotifications(guns);
} catch (Exception e) {