From fc14420374ea5974f4d5ff3c9461e51c4618cb4d Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 17 Jul 2012 22:57:07 -0700 Subject: [PATCH] minor peer review for IDEMPIERE-337 and IDEMPIERE-339 --- .../src/org/compiere/apps/search/InfoProduct.java | 6 ++---- .../org/adempiere/webui/panel/InfoProductPanel.java | 11 +++++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoProduct.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoProduct.java index e535b4a359..9a22c64ccd 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoProduct.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoProduct.java @@ -80,9 +80,9 @@ import org.jdesktop.swingx.JXTaskPane; public class InfoProduct extends Info implements ActionListener, ChangeListener { /** - * + * */ - private static final long serialVersionUID = 2076229793041196087L; + private static final long serialVersionUID = -2119729271332154941L; /** * Standard Constructor @@ -152,7 +152,6 @@ public class InfoProduct extends Info implements ActionListener, ChangeListener /** Array of Column Info */ private static Info_Column[] s_productLayout = null; - private static int s_productLayoutRole = -1; private static int INDEX_NAME = 0; private static int INDEX_PATTRIBUTE = 0; @@ -1134,7 +1133,6 @@ public class InfoProduct extends Info implements ActionListener, ChangeListener // return s_productLayout; // s_productLayout = null; - s_productLayoutRole = MRole.getDefault().getAD_Role_ID(); // IDEMPIERE_337 int M_Warehouse_ID = 0; KeyNamePair warehouse = (KeyNamePair)pickWarehouse.getSelectedItem(); 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 111713bfb2..3ad013b70d 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 @@ -94,9 +94,10 @@ import org.zkoss.zul.South; public class InfoProductPanel extends InfoPanel implements EventListener { /** - * + * */ - private static final long serialVersionUID = 6804975825156657866L; + private static final long serialVersionUID = 3728242035878883637L; + private Label lblValue = new Label(); private Textbox fieldValue = new Textbox(); private Label lblName = new Label(); @@ -152,7 +153,6 @@ public class InfoProductPanel extends InfoPanel implements EventListener /** Array of Column Info */ private static ColumnInfo[] s_productLayout = null; - private static int s_productLayoutRole = -1; private static int INDEX_NAME = 0; private static int INDEX_PATTRIBUTE = 0; @@ -537,7 +537,7 @@ public class InfoProductPanel extends InfoPanel implements EventListener this.setHeight(height + "px"); } - contentPanel.addActionListener(new EventListener() { + contentPanel.addActionListener(new EventListener() { public void onEvent(Event event) throws Exception { int row = contentPanel.getSelectedRow(); if (row >= 0) { @@ -579,7 +579,7 @@ public class InfoProductPanel extends InfoPanel implements EventListener where.append(" AND p.IsSummary='N'"); // dynamic Where Clause if (p_whereClause != null && p_whereClause.length() > 0) - where.append(" AND ") // replace fully qalified name with alias + where.append(" AND ") // replace fully qualified name with alias .append(Util.replace(p_whereClause, "M_Product.", "p.")); StringBuffer sqlMain = new StringBuffer("SELECT "); @@ -1251,7 +1251,6 @@ public class InfoProductPanel extends InfoPanel implements EventListener // return s_productLayout; // s_productLayout = null; - s_productLayoutRole = MRole.getDefault().getAD_Role_ID(); int M_Warehouse_ID = 0; ListItem listitem = pickWarehouse.getSelectedItem(); if (listitem != null)