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

Issue #1869 ensure all uses ofdataURI in PDO use getter.

Browse source 
Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f

Former-commit-id: 73a2c686c7 [formerly 05e7e0551f] [formerly b3865f4efc] [formerly b3865f4efc [formerly 268ee5ce30]] [formerly 191f93653d [formerly b3865f4efc [formerly 268ee5ce30] [formerly 191f93653d [formerly bcb8cea56a2efb9bf953c7acb474bb8046ef7570]]]]
Former-commit-id: 191f93653d
Former-commit-id: 84f9a24c2361839e1190a4843ddaf1e469c599a0 [formerly e05811b6ef35d30d860c10a4de489276bfcbbd43] [formerly 9c415e2f19 [formerly 50c5c5edfa]]
Former-commit-id: 9c415e2f19
Former-commit-id: c6150879d5
This commit is contained in:
Ben Steffensmeier 2013-05-29 17:49:44 -05:00
parent e72adb2f59
commit abbd7badbd
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());