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

Merge "Issue #1869 ensure all uses ofdataURI in PDO use getter. Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f" into development

Browse source 
Former-commit-id: 7d2d162be4 [formerly 79a8cd1b6f] [formerly dd10af4a8a] [formerly 7d2d162be4 [formerly 79a8cd1b6f] [formerly dd10af4a8a] [formerly 7f41d701be [formerly dd10af4a8a [formerly 6677e2f2af09b114066c64b465e7245d0566ee8a]]]]
Former-commit-id: 7f41d701be
Former-commit-id: d3a25be20d [formerly 5858e8fc19] [formerly 29d381fcafb440df8bee454e31c8b3d99cccd467 [formerly d2f617a49c]]
Former-commit-id: 49ac9580799a6f8e8e6f9ed09976978c1289bb2c [formerly 9e3809d6cd]
Former-commit-id: 9579b62577
This commit is contained in:
Ron Anderson 2013-05-30 13:08:26 -05:00 • committed by Gerrit Code Review
commit 90b02d376c
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java
View file

@ -249,7 +249,7 @@ public abstract class PluginDataObject extends PersistableDataObject implements
@Override
public String getIdentifier() {
return dataURI;
return getDataURI();
}
@Override
@ -307,12 +307,13 @@ public abstract class PluginDataObject extends PersistableDataObject implements
} else if (dataTime.getFcstTime() != rhs.getDataTime().getFcstTime()) {
return false;
}
String dataURI = getDataURI();
String rhsDataURI = rhs.getDataURI();
if (dataURI == null) {
if (rhs.dataURI != null) {
if (rhsDataURI != null) {
return false;
}
} else if (!dataURI.equals(rhs.dataURI)) {
} else if (!dataURI.equals(rhsDataURI)) {
return false;
}
@ -341,7 +342,8 @@ public abstract class PluginDataObject extends PersistableDataObject implements
int result = 1;
result = prime * result
+ ((dataTime == null) ? 0 : dataTime.hashCode());
result = prime * result + ((dataURI == null) ? 0 : dataURI.hashCode());
result = prime * result
+ ((getDataURI() == null) ? 0 : dataURI.hashCode());
result = prime * result + id;
result = prime * result
+ ((insertTime == null) ? 0 : insertTime.hashCode());