midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed build error after merge with changes from release-1.0c branch.

This commit is contained in:
Heng Sin Low 2013-08-24 01:37:01 +08:00
parent f9298dc722
commit 736fcf7356
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/TableIndexElementHandler.java
View File

@ -53,18 +53,10 @@ public class TableIndexElementHandler extends AbstractElementHandler {
if (isProcessElement(ctx.ctx, entitytype)) {
MTableIndex mTableIndex = findPO(ctx, element);
if (mTableIndex == null) {
int id = 0;
if (!hasUUIDKey(ctx, element)) {
String name = getStringValue(element, "Name");
id = findIdByColumn(ctx, "AD_TableIndex_ID", "Name", name, true);
}
mTableIndex = new MTableIndex(ctx.ctx, id > 0 ? id : 0, getTrxName(ctx));
mTableIndex = new MTableIndex(ctx.ctx, 0, getTrxName(ctx));
}
PoFiller filler = new PoFiller(ctx, mTableIndex, element, this);
List<String> excludes = defaultExcludeList(MTableIndex.Table_Name);
if (mTableIndex.getAD_TableIndex_ID() == 0 && isOfficialId(element, "AD_TableIndex_ID"))
mTableIndex.setAD_TableIndex_ID(getIntValue(element, "AD_TableIndex_ID"));
List<String> excludes = defaultExcludeList(MTableIndex.Table_Name);
List<String> notfounds = filler.autoFill(excludes);
if (notfounds.size() > 0) {
element.defer = true;
@ -151,6 +143,7 @@ public class TableIndexElementHandler extends AbstractElementHandler {
}
}
verifyPackOutRequirement(m_TableIndex);
addTypeName(atts, "table");
document.startElement("", "", MTableIndex.Table_Name, atts);
createTableIndexBinding(ctx, document, m_TableIndex);

11
org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ViewComponentElementHandler.java
View File

@ -48,18 +48,10 @@ public class ViewComponentElementHandler extends AbstractElementHandler {
if (isProcessElement(ctx.ctx, entitytype)) {
MViewComponent mViewComponent = findPO(ctx, element);
if (mViewComponent == null) {
int id = 0;
if (!hasUUIDKey(ctx, element)) {
String name = getStringValue(element, "Name");
id = findIdByColumn(ctx, "AD_ViewComponent_ID", "Name", name, true);
}
mViewComponent = new MViewComponent(ctx.ctx, id > 0 ? id : 0, getTrxName(ctx));
mViewComponent = new MViewComponent(ctx.ctx, 0, getTrxName(ctx));
}
PoFiller filler = new PoFiller(ctx, mViewComponent, element, this);
List<String> excludes = defaultExcludeList(MViewComponent.Table_Name);
if (mViewComponent.getAD_ViewComponent_ID() == 0 && isOfficialId(element, "AD_ViewComponent_ID"))
mViewComponent.setAD_ViewComponent_ID(getIntValue(element, "AD_ViewComponent_ID"));
List<String> notfounds = filler.autoFill(excludes);
if (notfounds.size() > 0) {
element.defer = true;
@ -111,6 +103,7 @@ public class ViewComponentElementHandler extends AbstractElementHandler {
}
if (createElement) {
verifyPackOutRequirement(m_ViewComponent);
addTypeName(atts, "table");
document.startElement("", "", MViewComponent.Table_Name, atts);
createViewComponentBinding(ctx, document, m_ViewComponent);