From 944542b2d5edb19c0833d6f7d3634cb131d313c0 Mon Sep 17 00:00:00 2001 From: Richard Morales Date: Thu, 20 Dec 2012 17:56:26 -0500 Subject: [PATCH] IDEMPIERE-455 Discover and fix FindBugs problems / Eclipse warning -> deprecated --- .../webui/apps/form/WArchiveViewer.java | 14 +++++++++---- .../adempiere/webui/apps/form/WBOMDrop.java | 21 +++++++++++++------ .../webui/apps/form/WFileImport.java | 13 ++++++++---- 3 files changed, 34 insertions(+), 14 deletions(-) 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 6891698f36..09de45188d 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 @@ -62,6 +62,7 @@ import org.zkoss.util.media.AMedia; 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.Cell; import org.zkoss.zul.Div; import org.zkoss.zul.Hbox; import org.zkoss.zul.Iframe; @@ -407,10 +408,15 @@ public class WArchiveViewer extends Archive implements IFormController, EventLis Tabpanel tabViewPanel = new Tabpanel(); Hbox boxViewSeparator = new Hbox(); boxViewSeparator.setWidth("100%"); - boxViewSeparator.setHeight("100%"); - boxViewSeparator.setWidths("70%, 30%"); - boxViewSeparator.appendChild(iframe); - boxViewSeparator.appendChild(gridView); + boxViewSeparator.setHeight("100%"); + Cell cell = new Cell(); + cell.setWidth("70%"); + cell.appendChild(iframe); + boxViewSeparator.appendChild(cell); + cell = new Cell(); + cell.setWidth("30%"); + cell.appendChild(gridView); + boxViewSeparator.appendChild(cell); tabViewPanel.appendChild(boxViewSeparator); tabs.appendChild(tabView); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WBOMDrop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WBOMDrop.java index 393b4c78e6..f79ab4acf9 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WBOMDrop.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WBOMDrop.java @@ -59,6 +59,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.Caption; +import org.zkoss.zul.Cell; import org.zkoss.zul.Decimalbox; import org.zkoss.zul.Groupbox; import org.zkoss.zul.Hbox; @@ -470,7 +471,8 @@ public class WBOMDrop extends ADForm implements EventListener Hbox boxQty = new Hbox(); boxQty.setWidth("100%"); - boxQty.setWidths("10%, 40%, 50%"); + Cell cell = new Cell(); + cell.setWidth("10%"); if (MProductBOM.BOMTYPE_StandardPart.equals(bomType)) { @@ -481,7 +483,7 @@ public class WBOMDrop extends ADForm implements EventListener cb.setEnabled(false); m_selectionList.add(cb); - boxQty.appendChild(cb); + cell.appendChild(cb); } else if (MProductBOM.BOMTYPE_OptionalPart.equals(bomType)) { @@ -493,7 +495,7 @@ public class WBOMDrop extends ADForm implements EventListener cb.addEventListener(Events.ON_CHECK, this); m_selectionList.add(cb); - boxQty.appendChild(cb); + cell.appendChild(cb); } else // Alternative { @@ -519,8 +521,9 @@ public class WBOMDrop extends ADForm implements EventListener } b.addEventListener(Events.ON_CLICK, this); m_selectionList.add(b); - boxQty.appendChild(b); + cell.appendChild(b); } + boxQty.appendChild(cell); // Add to List & display m_productList.add (new Integer(M_Product_ID)); @@ -532,8 +535,14 @@ public class WBOMDrop extends ADForm implements EventListener Label label = new Label(name); HtmlBasedComponent c = (HtmlBasedComponent) label.rightAlign(); c.setStyle(c.getStyle() + ";margin-right: 5px"); - boxQty.appendChild(c); - boxQty.appendChild(qty); + cell = new Cell(); + cell.setWidth("40%"); + cell.appendChild(c); + boxQty.appendChild(cell); + cell = new Cell(); + cell.setWidth("50%"); + cell.appendChild(qty); + boxQty.appendChild(cell); grpSelectProd.appendChild(boxQty); } // addDisplay diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFileImport.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFileImport.java index 900eb44e37..a39b0523d9 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFileImport.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFileImport.java @@ -56,6 +56,7 @@ import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.UploadEvent; import org.zkoss.zul.Borderlayout; +import org.zkoss.zul.Cell; import org.zkoss.zul.Center; import org.zkoss.zul.Div; import org.zkoss.zul.Hbox; @@ -468,10 +469,13 @@ public class WFileImport extends ADForm implements EventListener Hbox hbox = new Hbox(); hbox.setWidth("100%"); - hbox.setWidths("30%, 70%"); hbox.setStyle("padding-bottom: 3px"); - - hbox.appendChild(m_labels[i].rightAlign()); + Cell cell = new Cell(); + cell.setWidth("30%"); + cell.appendChild(m_labels[i].rightAlign()); + hbox.appendChild(cell); + cell = new Cell(); + cell.setWidth("70%"); int length = row.getEndNo() - row.getStartNo(); @@ -483,7 +487,8 @@ public class WFileImport extends ADForm implements EventListener m_fields[i] = new Textbox(); m_fields[i].setStyle("margin-left: 2px"); - hbox.appendChild(m_fields[i]); + cell.appendChild(m_fields[i]); + hbox.appendChild(cell); previewPanel.appendChild(hbox); }