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

IDEMPIERE-455 Discover and fix FindBugs problems / Eclipse warning -> deprecated setSpans

This commit is contained in:
Richard Morales 2012-12-19 18:25:56 -05:00
parent df48675ea8
commit 3bd806e304
21 changed files with 158 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ValuePreference.java
View File

@ -276,25 +276,23 @@ public class ValuePreference extends Window implements EventListener<Event>
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<Event>
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);
//

6
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
View File

@ -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())
{

11
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java
View File

@ -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());

77
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WArchiveViewer.java
View File

@ -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);

20
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAttributeGrid.java
View File

@ -122,42 +122,38 @@ public class WAttributeGrid extends ADForm implements EventListener<Event>
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();

7
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java
View File

@ -310,10 +310,10 @@ public class WCharge extends Charge implements IFormController, EventListener<Ev
Row row = new Row();
rows.appendChild(row);
row.setSpans("3");
Label label = new Label(Msg.getMsg(Env.getCtx(), "ChargeNewAccount"));
label.setStyle("font-weight: bold;");
row.appendChild(label);
row.appendCellChild(label, 3);
row = new Row();
rows.appendChild(row);
@ -329,8 +329,7 @@ public class WCharge extends Charge implements IFormController, EventListener<Ev
row = new Row();
rows.appendChild(row);
row.setSpans("3");
row.appendChild(new Separator());
row.appendCellChild(new Separator(), 3);
return;
}

7
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMatch.java
View File

@ -236,10 +236,9 @@ public class WMatch extends Match
row.appendChild(new Space());
row = rows.newRow();
row.setSpans("1,1,3");
row.appendChild(matchModeLabel.rightAlign());
row.appendChild(matchMode);
row.appendChild(new Space());
row.appendCellChild(matchModeLabel.rightAlign(), 1);
row.appendCellChild(matchMode, 1);
row.appendCellChild(new Space(), 3);
row = rows.newRow();
row.appendChild(onlyVendorLabel.rightAlign());

15
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayment.java
View File

@ -341,9 +341,8 @@ public class WPayment extends Window
row.appendChild(kOnline);
row = rows.newRow();
row.setSpans("3,1");
row.appendChild(kStatus);
row.appendChild(new Space());
row.appendCellChild(kStatus, 3);
row.appendCellChild(new Space(), 1);
// DircetDebit/Credit
tPanel.appendChild(tPanelLayout);
@ -379,9 +378,8 @@ public class WPayment extends Window
row.appendChild(tOnline);
row = rows.newRow();
row.setSpans("3,1");
row.appendChild(tStatus);
row.appendChild(new Space());
row.appendCellChild(tStatus, 3);
row.appendCellChild(new Space(), 1);
// Cheque
sPanel.appendChild(sPanelLayout);
@ -439,9 +437,8 @@ public class WPayment extends Window
row.appendChild(sOnline);
row = rows.newRow();
row.setSpans("3,1");
row.appendChild(sStatus);
row.appendChild(new Space());
row.appendCellChild(sStatus, 3);
row.appendCellChild(new Space(), 1);
// Cash
pPanel.appendChild(pPanelLayout);

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSQLProcess.java
View File

@ -118,8 +118,7 @@ public class WSQLProcess extends ADForm implements EventListener<Event>
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);

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTabEditor.java
View File

@ -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<numCols;h++){
@ -244,7 +243,9 @@ public class WTabEditor extends TabEditor implements IFormController, EventListe
else
{
Group rowg = new Group(fieldGroup);
rowg.setSpans(numColsS);
Cell cell = new Cell();
cell.setColspan(numCols);
rowg.appendChild(cell);
if (X_AD_FieldGroup.FIELDGROUPTYPE_Tab.equals(gridField.getFieldGroupType()) || gridField.getIsCollapsedByDefault())
{
rowg.setOpen(false);

24
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoCashLinePanel.java
View File

@ -226,29 +226,27 @@ public class InfoCashLinePanel extends InfoPanel implements ValueChangeListener,
row.appendChild(cbAbsolute);
row = new Row();
row.setSpans("1, 1, 1, 2");
rows.appendChild(row);
row.appendChild(fInvoice_ID.getLabel().rightAlign());
row.appendChild(fInvoice_ID.getComponent());
row.appendChild(lDateFrom.rightAlign());
row.appendCellChild(fInvoice_ID.getLabel().rightAlign(), 1);
row.appendCellChild(fInvoice_ID.getComponent(), 1);
row.appendCellChild(lDateFrom.rightAlign(), 1);
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("1, 1, 1, 2");
rows.appendChild(row);
row.appendChild(fBankAccount_ID.getLabel().rightAlign());
row.appendChild(fBankAccount_ID.getComponent());
row.appendChild(lAmtFrom.rightAlign());
row.appendCellChild(fBankAccount_ID.getLabel().rightAlign(), 1);
row.appendCellChild(fBankAccount_ID.getComponent(), 1);
row.appendCellChild(lAmtFrom.rightAlign(), 1);
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%");
layout.setHeight("100%");

18
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java
View File

@ -205,23 +205,21 @@ public class InfoInOutPanel extends InfoPanel implements ValueChangeListener, Ev
row.appendChild(fIsSOTrx);
row = new Row();
row.setSpans("1, 1, 1, 2");
rows.appendChild(row);
row.appendChild(lDescription.rightAlign());
row.appendChild(fDescription);
row.appendChild(lDateFrom.rightAlign());
row.appendCellChild(lDescription.rightAlign(), 1);
row.appendCellChild(fDescription, 1);
row.appendCellChild(lDateFrom.rightAlign(), 1);
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("1, 1, 3");
row.appendCellChild(lPOReference.rightAlign(), 1);
row.appendCellChild(fPOReference, 1);
row.appendCellChild(new Label(), 3);
rows.appendChild(row);
row.appendChild(lPOReference.rightAlign());
row.appendChild(fPOReference);
row.appendChild(new Label());
layout = new Borderlayout();
layout.setWidth("100%");

22
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java
View File

@ -234,28 +234,26 @@ public class InfoInvoicePanel extends InfoPanel implements ValueChangeListener
row.appendChild(isPaid);
row = new Row();
row.setSpans("1, 1, 1, 3");
rows.appendChild(row);
row.appendChild(lblDescription.rightAlign());
row.appendChild(txtDescription);
row.appendChild(lblDateInvoiced.rightAlign());
row.appendCellChild(lblDescription.rightAlign(), 1);
row.appendCellChild(txtDescription, 1);
row.appendCellChild(lblDateInvoiced.rightAlign(), 1);
Hbox hbox = new Hbox();
hbox.appendChild(dateFrom);
hbox.appendChild(new Label("-"));
hbox.appendChild(dateTo);
row.appendChild(hbox);
row.appendCellChild(hbox, 3);
rows.appendChild(row);
row = new Row();
row.setSpans("1, 1, 1, 3");
rows.appendChild(row);
row.appendChild(editorOrder.getLabel().rightAlign());
row.appendChild(editorOrder.getComponent());
row.appendChild(lblGrandTotal.rightAlign());
row.appendCellChild(editorOrder.getLabel().rightAlign(), 1);
row.appendCellChild(editorOrder.getComponent(), 1);
row.appendCellChild(lblGrandTotal.rightAlign(), 1);
hbox = new Hbox();
hbox.appendChild(amountFrom);
hbox.appendChild(new Label("-"));
hbox.appendChild(amountTo);
row.appendChild(hbox);
row.appendCellChild(hbox, 3);
rows.appendChild(row);
layout = new Borderlayout();
layout.setWidth("100%");

22
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java
View File

@ -211,28 +211,26 @@ public class InfoOrderPanel extends InfoPanel implements ValueChangeListener
row.appendChild(isSoTrx);
row = new Row();
row.setSpans("1, 1, 1, 2");
rows.appendChild(row);
row.appendChild(lblDescription.rightAlign());
row.appendChild(txtDescription);
row.appendChild(lblDateOrdered.rightAlign());
row.appendCellChild(lblDescription.rightAlign(), 1);
row.appendCellChild(txtDescription, 1);
row.appendCellChild(lblDateOrdered.rightAlign(), 1);
Hbox hbox = new Hbox();
hbox.appendChild(dateFrom);
hbox.appendChild(new Label("-"));
hbox.appendChild(dateTo);
row.appendChild(hbox);
row.appendCellChild(hbox, 2);
rows.appendChild(row);
row = new Row();
row.setSpans("1, 1, 1, 2");
rows.appendChild(row);
row.appendChild(lblOrderRef.rightAlign());
row.appendChild(txtOrderRef);
row.appendChild(lblGrandTotal.rightAlign());
row.appendCellChild(lblOrderRef.rightAlign(), 1);
row.appendCellChild(txtOrderRef, 1);
row.appendCellChild(lblGrandTotal.rightAlign(), 1);
hbox = new Hbox();
hbox.appendChild(amountFrom);
hbox.appendChild(new Label("-"));
hbox.appendChild(amountTo);
row.appendChild(hbox);
row.appendCellChild(hbox, 2);
rows.appendChild(row);
layout = new Borderlayout();
layout.setWidth("100%");

17
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java
View File

@ -44,6 +44,7 @@ import org.compiere.util.Msg;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zul.Cell;
import org.zkoss.zul.Div;
import org.zkoss.zul.Separator;
import org.zkoss.zul.Textbox;
@ -250,14 +251,18 @@ public class InfoPAttributePanel extends Window implements EventListener<Event>
{
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<Event>
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);

14
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java
View File

@ -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%");

21
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java
View File

@ -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<Event>
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<Event>
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%");

7
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java
View File

@ -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);

21
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAssignmentDialog.java
View File

@ -170,8 +170,7 @@ public class WAssignmentDialog extends Window implements EventListener<Event>
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<Event>
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<Event>
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

9
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java
View File

@ -244,8 +244,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, 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<Event>, 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<Event>, ValueC
row = new Row();
rows.appendChild(row);
row.setSpans("2");
row.appendChild(fMessage);
row.appendCellChild(fMessage, 2);
fMessage.setHflex("1");
fMessage.setRows(10);

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java
View File

@ -208,11 +208,10 @@ public class WRecordAccessDialog extends Window implements EventListener<Event>
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);