Merge in v4 code changes

This commit is contained in:
Rob Bygrave committed 2014-04-03 03:47:55 +13:00
commit 96e4b4640f
171 files changed
+2747 -3848

No files matched your search

@@ -14,7 +14,7 @@ public final class SqlTreeNodeManyRoot extends SqlTreeNodeBean {
}
@Override
protected void postLoad(DbReadContext cquery, Object loadedBean, Object id, Object lazyLoadParentId) {
protected void postLoad(DbReadContext cquery, EntityBean loadedBean, Object id, Object lazyLoadParentId) {
// put the localBean into the manyValue so that it
// is added to the collection/map
@@ -22,7 +22,7 @@ public final class SqlTreeNodeManyRoot extends SqlTreeNodeBean {
}
@Override
public void load(DbReadContext cquery, Object parentBean) throws SQLException {
public void load(DbReadContext cquery, EntityBean parentBean) throws SQLException {
// pass in null for parentBean because the localBean
// that is built is added to a collection rather than
// being set to the parentBean directly