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

minor peer review for IDEMPIERE-337 and IDEMPIERE-339

This commit is contained in:
Carlos Ruiz 2012-07-17 22:57:07 -07:00
parent 3133906bae
commit fc14420374
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.adempiere.ui.swing/src/org/compiere/apps/search/InfoProduct.java
View File

@ -80,9 +80,9 @@ import org.jdesktop.swingx.JXTaskPane;
public class InfoProduct extends Info implements ActionListener, ChangeListener public class InfoProduct extends Info implements ActionListener, ChangeListener
{ {
/** /**
* *
*/ */
private static final long serialVersionUID = 2076229793041196087L; private static final long serialVersionUID = -2119729271332154941L;
/** /**
* Standard Constructor * Standard Constructor
@ -152,7 +152,6 @@ public class InfoProduct extends Info implements ActionListener, ChangeListener
/** Array of Column Info */ /** Array of Column Info */
private static Info_Column[] s_productLayout = null; private static Info_Column[] s_productLayout = null;
private static int s_productLayoutRole = -1;
private static int INDEX_NAME = 0; private static int INDEX_NAME = 0;
private static int INDEX_PATTRIBUTE = 0; private static int INDEX_PATTRIBUTE = 0;
@ -1134,7 +1133,6 @@ public class InfoProduct extends Info implements ActionListener, ChangeListener
// return s_productLayout; // return s_productLayout;
// //
s_productLayout = null; s_productLayout = null;
s_productLayoutRole = MRole.getDefault().getAD_Role_ID();
// IDEMPIERE_337 // IDEMPIERE_337
int M_Warehouse_ID = 0; int M_Warehouse_ID = 0;
KeyNamePair warehouse = (KeyNamePair)pickWarehouse.getSelectedItem(); KeyNamePair warehouse = (KeyNamePair)pickWarehouse.getSelectedItem();

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

@ -94,9 +94,10 @@ import org.zkoss.zul.South;
public class InfoProductPanel extends InfoPanel implements EventListener 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 Label lblValue = new Label();
private Textbox fieldValue = new Textbox(); private Textbox fieldValue = new Textbox();
private Label lblName = new Label(); private Label lblName = new Label();
@ -152,7 +153,6 @@ public class InfoProductPanel extends InfoPanel implements EventListener
/** Array of Column Info */ /** Array of Column Info */
private static ColumnInfo[] s_productLayout = null; private static ColumnInfo[] s_productLayout = null;
private static int s_productLayoutRole = -1;
private static int INDEX_NAME = 0; private static int INDEX_NAME = 0;
private static int INDEX_PATTRIBUTE = 0; private static int INDEX_PATTRIBUTE = 0;
@ -537,7 +537,7 @@ public class InfoProductPanel extends InfoPanel implements EventListener
this.setHeight(height + "px"); this.setHeight(height + "px");
} }
contentPanel.addActionListener(new EventListener() { contentPanel.addActionListener(new EventListener<Event>() {
public void onEvent(Event event) throws Exception { public void onEvent(Event event) throws Exception {
int row = contentPanel.getSelectedRow(); int row = contentPanel.getSelectedRow();
if (row >= 0) { if (row >= 0) {
@ -579,7 +579,7 @@ public class InfoProductPanel extends InfoPanel implements EventListener
where.append(" AND p.IsSummary='N'"); where.append(" AND p.IsSummary='N'");
// dynamic Where Clause // dynamic Where Clause
if (p_whereClause != null && p_whereClause.length() > 0) 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.")); .append(Util.replace(p_whereClause, "M_Product.", "p."));
StringBuffer sqlMain = new StringBuffer("SELECT "); StringBuffer sqlMain = new StringBuffer("SELECT ");
@ -1251,7 +1251,6 @@ public class InfoProductPanel extends InfoPanel implements EventListener
// return s_productLayout; // return s_productLayout;
// //
s_productLayout = null; s_productLayout = null;
s_productLayoutRole = MRole.getDefault().getAD_Role_ID();
int M_Warehouse_ID = 0; int M_Warehouse_ID = 0;
ListItem listitem = pickWarehouse.getSelectedItem(); ListItem listitem = pickWarehouse.getSelectedItem();
if (listitem != null) if (listitem != null)