From edc590967ea8d54bb8be040ede1a6032323cb510 Mon Sep 17 00:00:00 2001 From: Diego Ruiz <12065321+d-ruiz@users.noreply.github.com> Date: Thu, 14 Jul 2022 23:53:51 +0200 Subject: [PATCH] IDEMPIERE-4723 - Removed dead code from org.adempiere.webui.window.* (#1397) --- .../adempiere/webui/window/FindWindow.java | 40 +------------------ .../adempiere/webui/window/InfoSchedule.java | 17 -------- .../webui/window/WAccountDialog.java | 3 +- .../webui/window/WAutoCompleterCity.java | 3 -- .../src/org/adempiere/webui/window/WChat.java | 4 +- .../webui/window/WLocatorDialog.java | 2 - .../webui/window/WPAttributeDialog.java | 21 +--------- .../webui/window/WPAttributeInstance.java | 17 -------- .../webui/window/ZkReportViewer.java | 2 +- 9 files changed, 6 insertions(+), 103 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java index 7703855739..299a581acd 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java @@ -1962,8 +1962,6 @@ public class FindWindow extends Window implements EventListener, ValueCha if(history.length() > 0) { historyCombo.setAttribute("history", history); - //historyCombo.setSelectedItem(new Comboitem(history)); - //historyCombo.setSelectedItem(new Comboitem(history, history)); historyCombo.setSelectedIndex(getHistoryIndex(history)+1); } } @@ -2537,14 +2535,6 @@ public class FindWindow extends Window implements EventListener, ValueCha m_query.addRestriction(ColumnSQL.toString(), oper, value, ColumnName, wed.getDisplay()); appendCode(code, ColumnName, oper, value.toString(), "", "AND", "", "", m_AD_Tab_UU); } - - /* - if (value.toString().indexOf('%') != -1) - m_query.addRestriction(ColumnName, MQuery.LIKE, value, ColumnName, ved.getDisplay()); - else - m_query.addRestriction(ColumnName, MQuery.EQUAL, value, ColumnName, ved.getDisplay()); - */ - // end globalqss patch } } else if (valueTo != null && valueTo.toString().length() > 0) { // filled upper limit without filling lower limit @@ -3031,9 +3021,7 @@ public class FindWindow extends Window implements EventListener, ValueCha } else if (log.isLoggable(Level.CONFIG)) log.config("#" + m_total); - // - /*if (query != null) - statusBar.setStatusToolTip (query.getWhereClause());*/ + return m_total; } // getNoOfRecords @@ -3461,10 +3449,6 @@ public class FindWindow extends Window implements EventListener, ValueCha attributeSQL.append(" AND value "); } -// else if(attribute.getAttributeValueType().equals(MAttribute.ATTRIBUTEVALUETYPE_TableDirect)) { -// -// attributeSQL.append(" AND record_ID "); -// } return attributeSQL.toString(); } // getAttributeSQL @@ -3544,16 +3528,7 @@ public class FindWindow extends Window implements EventListener, ValueCha //String editor.setValue(value); } -// else if(attributeValue.equals(MAttribute.ATTRIBUTEVALUETYPE_TableDirect)) { -// -// int AD_Column_ID = attribute.getAD_Column_ID(); -// MLookup attributes = MLookupFactory.get(Env.getCtx(), m_targetWindowNo, AD_Column_ID, DisplayType.TableDir, Env.getLanguage(Env.getCtx()), -// attribute.getAD_Column().getColumnName(), 0, true, null); -// editor = new WTableDirEditor(attribute.getAD_Column().getName(), true, false, true, attributes); -// -// editor.setValue(Integer.valueOf(in)); -// } - // + editor.addValueChangeListener(this); editor.setReadWrite(enabled); editor.setVisible(enabled); @@ -3728,21 +3703,11 @@ public class FindWindow extends Window implements EventListener, ValueCha editor = new WStringEditor("Test", true, false, true, 40, 40, null, null); } -// else if(attributeValue.equals(MAttribute.ATTRIBUTEVALUETYPE_TableDirect)) { -// -// int AD_Column_ID = attribute.getAD_Column_ID(); -// MLookup orders = MLookupFactory.get(Env.getCtx(), m_targetWindowNo, AD_Column_ID, DisplayType.TableDir, Env.getLanguage(Env.getCtx()), -// attribute.getAD_Column().getColumnName(), 0, true, null); -// editor = new WTableDirEditor(attribute.getAD_Column().getName(), true, false, true, orders); -// -// } - // editor.addValueChangeListener(this); editor.setValue(null); editor.setReadWrite(enabled); editor.setVisible(enabled); - //editor.dynamicDisplay(); return editor.getComponent(); @@ -3767,7 +3732,6 @@ public class FindWindow extends Window implements EventListener, ValueCha // Return Integer if (dt.equals(String.valueOf(MAttribute.ATTRIBUTEVALUETYPE_AD_Reference_ID)) || dt.equals(MAttribute.ATTRIBUTEVALUETYPE_List)) -// || dt.equals(MAttribute.ATTRIBUTEVALUETYPE_TableDirect)) { if (value instanceof Integer) return value; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/InfoSchedule.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/InfoSchedule.java index b06b71bd42..c846da04b0 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/InfoSchedule.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/InfoSchedule.java @@ -660,21 +660,4 @@ public class InfoSchedule extends Window implements EventListener mask.detach(); } } - - /** -SELECT o.DocumentNo, ol.Line, ol.Description -FROM C_OrderLine ol, C_Order o -WHERE ol.S_ResourceAssignment_ID=1 - AND ol.C_Order_ID=o.C_Order_ID -UNION -SELECT i.DocumentNo, il.Line, il.Description -FROM C_InvoiceLine il, C_Invoice i -WHERE il.S_ResourceAssignment_ID=1 - AND il.C_Invoice_ID=i.C_Invoice_ID -UNION -SELECT e.DocumentNo, el.Line, el.Description -FROM S_TimeExpenseLine el, S_TimeExpense e -WHERE el.S_ResourceAssignment_ID=1 - AND el.S_TimeExpense_ID=el.S_TimeExpense_ID - */ } // InfoSchedule 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 63ad3aedc1..485909da1f 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 @@ -579,8 +579,7 @@ public final class WAccountDialog extends Window m_row.setStyle("background-color: transparent"); m_rows.appendChild(m_row); } -// else -// m_gbc.gridx = 2; + if (ClientInfo.maxWidth(ClientInfo.SMALL_WIDTH-1)) { Vlayout vlayout = new Vlayout(); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAutoCompleterCity.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAutoCompleterCity.java index 9b1c14bb43..a0775bdaaa 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAutoCompleterCity.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAutoCompleterCity.java @@ -222,10 +222,7 @@ public class WAutoCompleterCity extends AutoComplete implements EventListener, DialogEvents div.appendChild(button); Label timeLabel = createTimestampLabel(entry); div.appendChild(timeLabel); -// div.setStyle(REPLY_DIV_STYLE); - + Treechildren treeChildren = treeitem.getTreechildren(); if (treeChildren == null) { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java index ca2fbf19e9..f79f3dab43 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java @@ -485,10 +485,8 @@ public class WLocatorDialog extends Window implements EventListener private void enableNew() { boolean sel = chkCreateNew.isChecked(); - //lblWarehouse.setVisible(sel); lstWarehouse.setVisible(sel); lstWarehouse.getParent().setVisible(sel); - //lWarehouseInfo.setVisible(!sel); txtWarehouse.setVisible(!sel); txtWarehouse.getParent().setVisible(!sel); txtWarehouse.setReadonly(true); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java index fc10402195..bb012a66af 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java @@ -179,15 +179,12 @@ public class WPAttributeDialog extends Window implements EventListener private int m_row = 0; /** List of Editors */ private ArrayList m_editors = new ArrayList(); - /** Length of Instance value (40) */ - //private static final int INSTANCE_VALUE_LENGTH = 40; private Checkbox cbNewEdit = new Checkbox(); private Button bNewRecord = new Button(Msg.getMsg(Env.getCtx(), "NewRecord")); private Listbox existingCombo = new Listbox(); private Button bSelect = new Button(); // Lot -// private VString fieldLotString = new VString ("Lot", false, false, true, 20, 20, null, null); private Textbox fieldLotString = new Textbox(); private Listbox fieldLot = new Listbox(); private Button bLot = new Button(Msg.getMsg (Env.getCtx(), "New")); @@ -385,10 +382,7 @@ public class WPAttributeDialog extends Window implements EventListener row.appendChild(fieldLotString); ZKUpdateUtil.setHflex(fieldLotString, "1"); fieldLotString.setText (m_masi.getLot()); - // M_Lot_ID - // int AD_Column_ID = 9771; // M_AttributeSetInstance.M_Lot_ID - // fieldLot = new VLookup ("M_Lot_ID", false,false, true, - // MLookupFactory.get(Env.getCtx(), m_WindowNo, 0, AD_Column_ID, DisplayType.TableDir)); + String sql = "SELECT M_Lot_ID, Name " + "FROM M_Lot l " + "WHERE EXISTS (SELECT M_Product_ID FROM M_Product p " @@ -438,7 +432,6 @@ public class WPAttributeDialog extends Window implements EventListener } } // Popup -// fieldLot.addMouseListener(new VPAttributeDialog_mouseAdapter(this)); // popup mZoom = new Menuitem(Msg.getMsg(Env.getCtx(), "Zoom"), ThemeManager.getThemeResource("images/Zoom16.png")); if(ThemeManager.isUseFontIconForImage()) { mZoom.setIconSclass("z-icon-Zoom"); @@ -520,7 +513,6 @@ public class WPAttributeDialog extends Window implements EventListener // Attrribute Set Instance Description Label label = new Label (Msg.translate(Env.getCtx(), "Description")); -// label.setLabelFor(fieldDescription); fieldDescription.setText(m_masi.getDescription()); fieldDescription.setReadonly(true); Row row = new Row(); @@ -981,17 +973,6 @@ public class WPAttributeDialog extends Window implements EventListener log.info(zoomQuery.toString()); // //TODO: to port - /* - int AD_Window_ID = 257; // Lot - AWindow frame = new AWindow(); - if (frame.initWindow(AD_Window_ID, zoomQuery)) - { - this.setVisible(false); - this.setModal (false); // otherwise blocked - this.setVisible(true); - AEnv.addToWindowManager(frame); - AEnv.showScreen(frame, SwingConstants.EAST); - }*/ } // cmd_zoom /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeInstance.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeInstance.java index 6326425cd8..c195c01f3f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeInstance.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeInstance.java @@ -360,23 +360,6 @@ public class WPAttributeInstance extends Window implements EventListener + "; M_Locator_ID=" + m_M_Locator_ID); } // enableButtons - //TODO: double click support for WListbox - /** - * Mouse Clicked - * @param e event - */ - /* - public void mouseClicked(MouseEvent e) - { - // Double click with selected row => exit - if (e.getClickCount() > 1 && m_table.getSelectedRow() != -1) - { - enableButtons(); - dispose(); - } - }*/ // mouseClicked - - /** * Get Attribute Set Instance * @return M_AttributeSetInstance_ID or -1 diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java index fb0a670a28..ca6584d403 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java @@ -752,7 +752,7 @@ public class ZkReportViewer extends Window implements EventListener, ITab more.setIconSclass("z-icon-Expand"); else more.setImage(ThemeManager.getThemeResource("images/expand-header.png")); -// more.setStyle("float: right;"); + toolBar.appendChild(more); LayoutUtils.addSclass("space-between-content", toolBar); more.addEventListener(Events.ON_CLICK, evt -> {