From acd88e6e6e3c9ff44cf546f2dae52c0a75777d4c Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Thu, 7 Jun 2007 08:48:49 +0000 Subject: [PATCH] [ 1730452 ] Autocompletion on comboboxes --- base/src/org/compiere/model/Lookup.java | 16 +++++++++++++++- base/src/org/compiere/model/MLookup.java | 6 +++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/base/src/org/compiere/model/Lookup.java b/base/src/org/compiere/model/Lookup.java index 3cf115c8a2..6899cf2ca8 100644 --- a/base/src/org/compiere/model/Lookup.java +++ b/base/src/org/compiere/model/Lookup.java @@ -60,6 +60,8 @@ public abstract class Lookup extends AbstractListModel private int m_displayType; /** Window No */ private int m_WindowNo; + + private boolean m_mandatory; /** * Get Display Type @@ -264,7 +266,7 @@ public abstract class Lookup extends AbstractListModel // may cause delay *** The Actual Work *** p_data = getData (mandatory, onlyValidated, onlyActive, temporary); - + // Selected Object changed if (obj != m_selectedObject) { @@ -287,6 +289,8 @@ public abstract class Lookup extends AbstractListModel else log.fine(getColumnName() + ": #" + p_data.size() + " - ms=" + String.valueOf(System.currentTimeMillis()-startTime)); + + } // fillComboBox /** @@ -453,5 +457,15 @@ public abstract class Lookup extends AbstractListModel public void loadComplete() { } // loadComplete + + public void setMandatory(boolean flag) + { + m_mandatory = flag; + } + + public boolean isMandatory() + { + return m_mandatory; + } } // Lookup diff --git a/base/src/org/compiere/model/MLookup.java b/base/src/org/compiere/model/MLookup.java index 3266d9d983..ca8389d471 100644 --- a/base/src/org/compiere/model/MLookup.java +++ b/base/src/org/compiere/model/MLookup.java @@ -198,8 +198,8 @@ public final class MLookup extends Lookup implements Serializable && !m_info.IsParent && m_info.DisplayType != DisplayType.Search) { - m_loader = new MLoader(); - m_loader.run(); // sync! + fillComboBox(isMandatory(), true, true, false); + loadComplete(); retValue = (NamePair)m_lookup.get(key); if (retValue != null) return retValue; @@ -603,7 +603,7 @@ public final class MLookup extends Lookup implements Serializable // if (m_info.KeyColumn.indexOf("C_InvoiceLine_ID") != -1) // log.info(m_info.KeyColumn); } // Loader - + private long m_startTime = System.currentTimeMillis(); /**