From 3bd806e3049a23000edfb205bc412268b570d506 Mon Sep 17 00:00:00 2001 From: Richard Morales Date: Wed, 19 Dec 2012 18:25:56 -0500 Subject: [PATCH] IDEMPIERE-455 Discover and fix FindBugs problems / Eclipse warning -> deprecated setSpans --- .../org/adempiere/webui/ValuePreference.java | 19 ++--- .../adempiere/webui/adwindow/ADTabpanel.java | 6 +- .../webui/apps/form/WAllocation.java | 11 ++- .../webui/apps/form/WArchiveViewer.java | 77 +++++++------------ .../webui/apps/form/WAttributeGrid.java | 20 ++--- .../adempiere/webui/apps/form/WCharge.java | 7 +- .../org/adempiere/webui/apps/form/WMatch.java | 7 +- .../adempiere/webui/apps/form/WPayment.java | 15 ++-- .../webui/apps/form/WSQLProcess.java | 3 +- .../adempiere/webui/apps/form/WTabEditor.java | 5 +- .../webui/panel/InfoCashLinePanel.java | 24 +++--- .../adempiere/webui/panel/InfoInOutPanel.java | 18 ++--- .../webui/panel/InfoInvoicePanel.java | 22 +++--- .../adempiere/webui/panel/InfoOrderPanel.java | 22 +++--- .../webui/panel/InfoPAttributePanel.java | 17 +++- .../webui/panel/InfoPaymentPanel.java | 14 ++-- .../webui/panel/InfoProductPanel.java | 21 ++--- .../webui/window/WAccountDialog.java | 7 +- .../webui/window/WAssignmentDialog.java | 21 ++--- .../adempiere/webui/window/WEMailDialog.java | 9 +-- .../webui/window/WRecordAccessDialog.java | 3 +- 21 files changed, 158 insertions(+), 190 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ValuePreference.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ValuePreference.java index aa32d6df9a..ba45d4e829 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ValuePreference.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ValuePreference.java @@ -276,25 +276,23 @@ public class ValuePreference extends Window implements EventListener rows.setParent(setLayout); Row row = new Row(); - row.setSpans("1, 4, 1"); Div div = new Div(); div.setStyle("text-align: right"); div.appendChild(lAttribute); - row.appendChild(div); - row.appendChild(fAttribute); + row.appendCellChild(div, 1); + row.appendCellChild(fAttribute, 4); fAttribute.setWidth("100%"); - row.appendChild(lAttributeValue); + row.appendCellChild(lAttributeValue, 1); rows.appendChild(row); row = new Row(); - row.setSpans("1, 4, 1"); div = new Div(); div.setStyle("text-align: right"); div.appendChild(lValue); - row.appendChild(div); - row.appendChild(fValue); + row.appendCellChild(div, 1); + row.appendCellChild(fValue, 4); fValue.setWidth("100%"); - row.appendChild(lValueValue); + row.appendCellChild(lValueValue, 1); rows.appendChild(row); row = new Row(); @@ -309,9 +307,8 @@ public class ValuePreference extends Window implements EventListener rows.appendChild(row); row = new Row(); - row.setSpans("1, 5"); - row.appendChild(new Space()); - row.appendChild(lExplanation); + row.appendCellChild(new Space(), 1); + row.appendCellChild(lExplanation, 5); rows.appendChild(row); // diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java index f0e40726fb..310157a55e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java @@ -76,6 +76,7 @@ import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.util.Clients; import org.zkoss.zul.Button; +import org.zkoss.zul.Cell; import org.zkoss.zul.Center; import org.zkoss.zul.DefaultTreeNode; import org.zkoss.zul.Div; @@ -454,7 +455,10 @@ DataStatusListener, IADTabpanel, IdSpace else { Group rowg = new Group(fieldGroup); - rowg.setSpans(numColsS); + Cell cell = new Cell(); + cell.setColspan(numCols); + rowg.appendChild(cell); + allCollapsibleGroups.add(rowg); if (X_AD_FieldGroup.FIELDGROUPTYPE_Tab.equals(field.getFieldGroupType()) || field.getIsCollapsedByDefault()) { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java index 5dddbf4193..4efe074587 100755 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java @@ -194,12 +194,11 @@ public class WAllocation extends Allocation row.appendChild(organizationPick.getComponent()); row = rows.newRow(); - row.appendChild(currencyLabel.rightAlign()); - row.appendChild(currencyPick.getComponent()); - row.appendChild(multiCurrency); - row.appendChild(new Space()); - row.appendChild(new Space()); - row.setSpans("1,1,2,1,1"); + row.appendCellChild(currencyLabel.rightAlign(),1); + row.appendCellChild(currencyPick.getComponent(),1); + row.appendCellChild(multiCurrency,2); + row.appendCellChild(new Space(),1); + row.appendCellChild(new Space(),1); row = rows.newRow(); row.appendChild(new Space()); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WArchiveViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WArchiveViewer.java index 88dadcba34..6891698f36 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WArchiveViewer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WArchiveViewer.java @@ -231,77 +231,69 @@ public class WArchiveViewer extends Archive implements IFormController, EventLis Row row = new Row(); rows.appendChild(row); - row.setSpans("3"); row.setAlign("right"); - row.appendChild(reportField); + row.appendCellChild(reportField, 3); row = new Row(); rows.appendChild(row); - row.setSpans("1, 2"); Div div = new Div(); div.setStyle("text-align: right;"); div.appendChild(processLabel); - row.appendChild(div); - row.appendChild(processField); + row.appendCellChild(div, 1); + row.appendCellChild(processField, 2); processField.setWidth("100%"); row = new Row(); rows.appendChild(row); - row.setSpans("1, 2"); div = new Div(); div.setStyle("text-align: right;"); div.appendChild(bPartnerLabel); - row.appendChild(div); - row.appendChild(bPartnerField.getComponent()); + row.appendCellChild(div, 1); + row.appendCellChild(bPartnerField.getComponent(), 2); row = new Row(); rows.appendChild(row); - row.setSpans("1, 2"); div = new Div(); div.setStyle("text-align: right;"); div.appendChild(tableLabel); - row.appendChild(div); - row.appendChild(tableField); + row.appendCellChild(div, 1); + row.appendCellChild(tableField, 2); tableField.setWidth("100%"); row = new Row(); rows.appendChild(row); - row.setSpans("1, 2"); div = new Div(); div.setStyle("text-align: right;"); div.appendChild(nameQLabel); - row.appendChild(div); - row.appendChild(nameQField); + row.appendCellChild(div, 1); + row.appendCellChild(nameQField, 2); nameQField.setWidth("100%"); row = new Row(); rows.appendChild(row); - row.setSpans("1, 2"); div = new Div(); div.setStyle("text-align: right;"); div.appendChild(descriptionQLabel); - row.appendChild(div); - row.appendChild(descriptionQField); + row.appendCellChild(div, 1); + row.appendCellChild(descriptionQField, 2); descriptionQField.setWidth("100%"); row = new Row(); rows.appendChild(row); - row.setSpans("1, 2"); div = new Div(); div.setStyle("text-align: right;"); div.appendChild(helpQLabel); - row.appendChild(div); - row.appendChild(helpQField); + row.appendCellChild(div, 1); + row.appendCellChild(helpQField, 2); helpQField.setWidth("100%"); row = new Row(); rows.appendChild(row); - row.setSpans("1, 2"); div = new Div(); div.setStyle("text-align: right;"); div.appendChild(createdByQLabel); - row.appendChild(div); - row.appendChild(createdByQField); + row.appendCellChild(div, 1); + row.appendCellChild(createdByQField, 2); createdByQField.setWidth("100%"); row = new Row(); @@ -335,87 +327,76 @@ public class WArchiveViewer extends Archive implements IFormController, EventLis row = new Row(); rows.appendChild(row); - row.setSpans("1, 2, 1"); div = new Div(); div.setStyle("text-align: left;"); div.appendChild(bBack); - row.appendChild(div); + row.appendCellChild(div, 1); div = new Div(); div.setStyle("text-align: center;"); div.appendChild(positionInfo); - row.appendChild(div); + row.appendCellChild(div, 2); div = new Div(); div.setStyle("text-align: right;"); div.appendChild(bNext); - row.appendChild(div); + row.appendCellChild(div, 1); row = new Row(); rows.appendChild(row); - row.setSpans("4"); - row.appendChild(createdByLabel); + row.appendCellChild(createdByLabel, 4); createdByLabel.setWidth("100%"); row = new Row(); rows.appendChild(row); - row.setSpans("4"); - row.appendChild(createdByField); + row.appendCellChild(createdByField, 4); createdByField.setWidth("100%"); row = new Row(); rows.appendChild(row); - row.setSpans("4"); div = new Div(); div.setStyle("text-align: right;"); div.appendChild(createdField); - row.appendChild(div); + row.appendCellChild(div, 4); row = new Row(); rows.appendChild(row); - row.setSpans("4"); - row.appendChild(nameLabel); + row.appendCellChild(nameLabel, 4); nameLabel.setWidth("100%"); row = new Row(); rows.appendChild(row); - row.setSpans("4"); - row.appendChild(nameField); + row.appendCellChild(nameField, 4); nameField.setWidth("100%"); row = new Row(); rows.appendChild(row); - row.setSpans("4"); - row.appendChild(descriptionLabel); + row.appendCellChild(descriptionLabel, 4); descriptionLabel.setWidth("100%"); row = new Row(); rows.appendChild(row); - row.setSpans("4"); - row.appendChild(descriptionField); + row.appendCellChild(descriptionField, 4); descriptionField.setRows(3); descriptionField.setWidth("100%"); row = new Row(); rows.appendChild(row); - row.setSpans("4"); - row.appendChild(helpLabel); + row.appendCellChild(helpLabel, 4); helpLabel.setWidth("100%"); row = new Row(); rows.appendChild(row); - row.setSpans("4"); - row.appendChild(helpField); + row.appendCellChild(helpField, 4); helpField.setRows(3); helpField.setWidth("100%"); row = new Row(); rows.appendChild(row); - row.setSpans("4"); div = new Div(); div.setStyle("text-align: right;"); div.appendChild(deleteArchive); div.appendChild(bRefresh); - div.appendChild(updateArchive); - row.appendChild(div); + div.appendChild(updateArchive); + row.appendCellChild(div, 4); createdByField.setReadonly(true); createdField.getDatebox().setReadonly(true); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAttributeGrid.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAttributeGrid.java index d2df0a9f78..466285ec6a 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAttributeGrid.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAttributeGrid.java @@ -122,42 +122,38 @@ public class WAttributeGrid extends ADForm implements EventListener Row row = new Row(); rows.appendChild(row); - row.setSpans("1, 2"); Div div = new Div(); div.setStyle("text-align: right;"); div.appendChild(attributeLabel1); - row.appendChild(div); - row.appendChild(attributeCombo1); + row.appendCellChild(div, 1); + row.appendCellChild(attributeCombo1, 2); attributeCombo1.setWidth("100%"); row = new Row(); rows.appendChild(row); - row.setSpans("1, 2"); div = new Div(); div.setStyle("text-align: right;"); div.appendChild(attributeLabel2); - row.appendChild(div); - row.appendChild(attributeCombo2); + row.appendCellChild(div, 1); + row.appendCellChild(attributeCombo2, 2); attributeCombo2.setWidth("100%"); row = new Row(); rows.appendChild(row); - row.setSpans("1, 2"); div = new Div(); div.setStyle("text-align: right;"); div.appendChild(labelPriceList); - row.appendChild(div); - row.appendChild(pickPriceList); + row.appendCellChild(div, 1); + row.appendCellChild(pickPriceList, 2); pickPriceList.setWidth("100%"); row = new Row(); rows.appendChild(row); - row.setSpans("1, 2"); div = new Div(); div.setStyle("text-align: right;"); div.appendChild(labelWarehouse); - row.appendChild(div); - row.appendChild(pickWarehouse); + row.appendCellChild(div, 1); + row.appendCellChild(pickWarehouse, 2); pickWarehouse.setWidth("100%"); div = new Div(); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java index 0ac5fc3a1a..7e26cd357d 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java @@ -310,10 +310,10 @@ public class WCharge extends Charge implements IFormController, EventListener m_txbResultField.setRows(noResultRows); m_txbResultField.setReadonly(true); - rwBottom.appendChild(m_txbResultField); - rwBottom.setSpans("3"); + rwBottom.appendCellChild(m_txbResultField, 3); rwBottom.setAlign("center"); rows.appendChild(rwBottom); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTabEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTabEditor.java index 0bc4d09a8c..bdefcbfe35 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTabEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTabEditor.java @@ -188,7 +188,6 @@ public class WTabEditor extends TabEditor implements IFormController, EventListe // set size in percentage per column leaving a MARGIN on right Columns columns = new Columns(); form.appendChild(columns); - String numColsS=String.valueOf(numCols); int equalWidth = 98 / numCols; for (int h=0;h { Row row = new Row(); rows.appendChild(row); - row.setSpans("2"); + Cell cell = new Cell(); + cell.setColspan(2); + row.appendCellChild(cell); Label group = new Label(Msg.translate(Env.getCtx(), "IsInstanceAttribute")); row.appendChild(group); rows.appendChild(row); row = new Row(); rows.appendChild(row); - row.setSpans("2"); + cell = new Cell(); + cell.setColspan(2); + row.appendCellChild(cell); Separator separator = new Separator(); separator.setBar(true); row.appendChild(separator); @@ -352,14 +357,18 @@ public class InfoPAttributePanel extends Window implements EventListener if (isGuarantee || isSerial || isLot) { Row row = new Row(); rows.appendChild(row); - row.setSpans("2"); + Cell cell = new Cell(); + cell.setColspan(2); + row.appendCellChild(cell); Label group = new Label(Msg.translate(Env.getCtx(), "IsInstanceAttribute")); row.appendChild(group); rows.appendChild(row); row = new Row(); rows.appendChild(row); - row.setSpans("2"); + cell = new Cell(); + cell.setColspan(2); + row.appendCellChild(cell); Separator separator = new Separator(); separator.setBar(true); row.appendChild(separator); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java index 18f67b22cc..f04c9e5303 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java @@ -212,24 +212,22 @@ public class InfoPaymentPanel extends InfoPanel implements ValueChangeListener, row.appendChild(fIsReceipt); row = new Row(); - row.setSpans("3, 2"); - rows.appendChild(row); - row.appendChild(lDateFrom.rightAlign()); + row.appendCellChild(lDateFrom.rightAlign(), 3); Hbox hbox = new Hbox(); hbox.appendChild(fDateFrom); hbox.appendChild(lDateTo); hbox.appendChild(fDateTo); - row.appendChild(hbox); + row.appendCellChild(hbox, 2); + rows.appendChild(row); row = new Row(); - row.setSpans("3, 2"); - rows.appendChild(row); - row.appendChild(lAmtFrom.rightAlign()); + row.appendCellChild(lAmtFrom.rightAlign(), 3); hbox = new Hbox(); hbox.appendChild(fAmtFrom); hbox.appendChild(lAmtTo); hbox.appendChild(fAmtTo); - row.appendChild(hbox); + row.appendCellChild(hbox, 2); + rows.appendChild(row); layout = new Borderlayout(); layout.setWidth("100%"); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java index 9a84c27867..c77ac30891 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java @@ -80,6 +80,7 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Cell; import org.zkoss.zul.Center; import org.zkoss.zul.North; import org.zkoss.zul.South; @@ -332,17 +333,17 @@ public class InfoProductPanel extends InfoPanel implements EventListener row.appendChild(m_InfoPAttributeButton); row = new Row(); - row.setSpans("1, 1, 1, 1, 1, 1, 1, 2"); - rows.appendChild(row); - row.appendChild(lblName.rightAlign()); - row.appendChild(fieldName); + row.appendCellChild(lblName.rightAlign()); + row.appendCellChild(fieldName); fieldName.setHflex("1"); - row.appendChild(lblSKU.rightAlign()); - row.appendChild(fieldSKU); + row.appendCellChild(lblSKU.rightAlign()); + row.appendCellChild(fieldSKU); fieldSKU.setHflex("1"); - row.appendChild(lblVendor.rightAlign()); - row.appendChild(fieldVendor); + row.appendCellChild(lblVendor.rightAlign()); + row.appendCellChild(fieldVendor); + rows.appendChild(row); fieldVendor.setHflex("1"); + // row = new Row(); @@ -357,7 +358,9 @@ public class InfoProductPanel extends InfoPanel implements EventListener row = new Row(); rows.appendChild(row); row.appendChild(statusBar); - row.setSpans("6"); + Cell cell = new Cell(); + cell.setColspan(6); + row.appendCellChild(cell); statusBar.setEastVisibility(false); statusBar.setWidth("100%"); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java index 9ddf0fd250..f82ab70caf 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java @@ -60,6 +60,7 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Cell; import org.zkoss.zul.Center; import org.zkoss.zul.North; import org.zkoss.zul.South; @@ -426,8 +427,10 @@ public final class WAccountDialog extends Window m_newRow = true; Row row = new Row(); f_Description.setStyle("font-decoration: italic;"); - row.appendChild(f_Description); - row.setSpans("4"); + Cell cell = new Cell(); + cell.setColspan(4); + cell.appendChild(f_Description); + row.appendChild(cell); row.setStyle("background-color: transparent;"); m_rows.appendChild(row); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAssignmentDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAssignmentDialog.java index 30b4305122..00cb9fba13 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAssignmentDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAssignmentDialog.java @@ -170,8 +170,7 @@ public class WAssignmentDialog extends Window implements EventListener rows.appendChild(row); row = new Row(); - row.setSpans("1, 2"); - row.appendChild(LayoutUtils.makeRightAlign(lDate)); + row.appendCellChild(LayoutUtils.makeRightAlign(lDate), 1); Div div = new Div(); div.setHflex("1"); div.appendChild(fDateFrom); @@ -179,7 +178,7 @@ public class WAssignmentDialog extends Window implements EventListener div.appendChild(fTimeFrom); fTimeFrom.setCols(10); fTimeFrom.setStyle("margin-left: 1px"); - row.appendChild(div); + row.appendCellChild(div, 2); rows.appendChild(row); row = new Row(); @@ -189,29 +188,25 @@ public class WAssignmentDialog extends Window implements EventListener rows.appendChild(row); row = new Row(); - row.setSpans("1, 2"); - row.appendChild(LayoutUtils.makeRightAlign(lName)); - row.appendChild(fName); + row.appendCellChild(LayoutUtils.makeRightAlign(lName), 1); + row.appendCellChild(fName, 2); fName.setStyle("width: 100%"); rows.appendChild(row); row = new Row(); - row.setSpans("1, 2"); - row.appendChild(LayoutUtils.makeRightAlign(lDescription)); - row.appendChild(fDescription); + row.appendCellChild(LayoutUtils.makeRightAlign(lDescription), 1); + row.appendCellChild(fDescription, 2); fDescription.setMultiline(true); fDescription.setRows(3); fDescription.setStyle("width: 100%"); rows.appendChild(row); row = new Row(); - row.setSpans("3"); - row.appendChild(new Label(" ")); + row.appendCellChild(new Label(" "), 3); rows.appendChild(row); row = new Row(); - row.setSpans("3"); - row.appendChild(confirmPanel); + row.appendCellChild(confirmPanel, 3); rows.appendChild(row); // } // jbInit diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java index 1f12e8c30b..102b671692 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java @@ -244,8 +244,7 @@ public class WEMailDialog extends Window implements EventListener, ValueC row = new Row(); rows.appendChild(row); - row.setSpans("2"); - row.appendChild(new Separator()); + row.appendCellChild(new Separator(), 2); row = new Row(); rows.appendChild(row); @@ -258,8 +257,7 @@ public class WEMailDialog extends Window implements EventListener, ValueC row = new Row(); rows.appendChild(row); - row.setSpans("2"); - row.appendChild(new Separator()); + row.appendCellChild(new Separator(), 2); row = new Row(); rows.appendChild(row); @@ -272,8 +270,7 @@ public class WEMailDialog extends Window implements EventListener, ValueC row = new Row(); rows.appendChild(row); - row.setSpans("2"); - row.appendChild(fMessage); + row.appendCellChild(fMessage, 2); fMessage.setHflex("1"); fMessage.setRows(10); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java index a2bb2a8178..496a7a7c8e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java @@ -208,11 +208,10 @@ public class WRecordAccessDialog extends Window implements EventListener row = new Row(); rows.appendChild(row); - row.setSpans("7"); Div div = new Div(); div.setStyle("text-align: right;"); div.appendChild(confirmPanel); - row.appendChild(div); + row.appendCellChild(div, 7); bUp.addEventListener(Events.ON_CLICK, this); bDown.addEventListener(Events.ON_CLICK, this);