Better search.

Author: yccheok

src/org/yccheok/jstock/engine/MatchType.java

@@ -43,10 +43,12 @@ public MatchType(String t, String n, String e, String id) {
     }
 
     public Code getCode() {
-        if (this.e.equals("NSE")) {
+        if ("NSE".equals(e)) {
             return Code.newInstance(this.t + ".N");
-        } else if (this.e.equals("BOM")) {
+        } else if ("BOM".equals(e)) {
             return Code.newInstance(this.t + ".B");
+        } else if (this.e == null || this.e.isEmpty()) {
+            return Code.newInstance(this.t);    
         }
         return Code.newInstance(this.e + ":" + this.t);
     }

src/org/yccheok/jstock/gui/AjaxAutoCompleteJComboBox.java

@@ -1,6 +1,6 @@
 /*
  * JStock - Free Stock Market Software
- * Copyright (C) 2011 Yan Cheng CHEOK <[email protected]>
+ * Copyright (C) 2015 Yan Cheng Cheok <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -353,14 +353,28 @@ private Observer<AjaxGoogleSearchEngineMonitor, MatchSetType> getGoogleMonitorOb
         return new Observer<AjaxGoogleSearchEngineMonitor, MatchSetType>() {
 
             @Override
-            public void update(final AjaxGoogleSearchEngineMonitor subject, final MatchSetType arg) {
+            public void update(final AjaxGoogleSearchEngineMonitor subject, MatchSetType arg) {
+                // Can we further enhance our search result?
+                if (arg.Match.isEmpty()) {
+                    StockInfo stockInfo = ajaxStockInfoSearchEngine.search(arg.Query);
+                    if (stockInfo != null) {
+                        MatchType matchType = new MatchType(stockInfo.code.toString(), stockInfo.symbol.toString(), null, null);
+                        List<MatchType> matchTypes = new ArrayList<>();
+                        matchTypes.add(matchType);
+                        MatchSetType matchSetType = MatchSetType.newInstance(arg.Query, matchTypes);
+                        arg = matchSetType;
+                    }
+                }
+
+                final MatchSetType _arg = arg;
+
                 if (SwingUtilities.isEventDispatchThread()) {
-                    _update(subject, arg);
+                    _update(subject, _arg);
                 } else {
                     SwingUtilities.invokeLater(new Runnable() {
                         @Override
                         public void run() {
-                            _update(subject, arg);
+                            _update(subject, _arg);
                         }
                     });
                 }

src/org/yccheok/jstock/gui/AutoCompleteJComboBox.java

@@ -1,6 +1,6 @@
 /*
  * JStock - Free Stock Market Software
- * Copyright (C) 2011 Yan Cheng CHEOK <[email protected]>
+ * Copyright (C) 2015 Yan Cheng Cheok <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -555,14 +555,28 @@ private Observer<AjaxGoogleSearchEngineMonitor, MatchSetType> getGoogleMonitorOb
         return new Observer<AjaxGoogleSearchEngineMonitor, MatchSetType>() {
 
             @Override
-            public void update(final AjaxGoogleSearchEngineMonitor subject, final MatchSetType arg) {
+            public void update(final AjaxGoogleSearchEngineMonitor subject, MatchSetType arg) {
+                // Can we further enhance our search result?
+                if (arg.Match.isEmpty()) {
+                    StockInfo stockInfo = ajaxStockInfoSearchEngine.search(arg.Query);
+                    if (stockInfo != null) {
+                        MatchType matchType = new MatchType(stockInfo.code.toString(), stockInfo.symbol.toString(), null, null);
+                        List<MatchType> matchTypes = new ArrayList<>();
+                        matchTypes.add(matchType);
+                        MatchSetType matchSetType = MatchSetType.newInstance(arg.Query, matchTypes);
+                        arg = matchSetType;
+                    }
+                }
+
+                final MatchSetType _arg = arg;
+                
                 if (SwingUtilities.isEventDispatchThread()) {
-                    _update(subject, arg);
+                    _update(subject, _arg);
                 } else {
                     SwingUtilities.invokeLater(new Runnable() {
                         @Override
                         public void run() {
-                            _update(subject, arg);
+                            _update(subject, _arg);
                         }
                     });
                 }

src/org/yccheok/jstock/gui/MatchSetCellRenderer.java

@@ -123,7 +123,14 @@ public Component getListCellRendererComponent(JList list, Object value, int inde
         final MatchType result = (MatchType)value;
         jLabel1.setText(result.t);
         jLabel2.setText(result.n);
-        jLabel3.setText(result.e);
+        
+        if (result.e == null) {
+            jLabel3.setVisible(false);
+        } else {
+            jLabel3.setVisible(true);
+            jLabel3.setText(result.e);
+        }
+        
         return this;
     }
 }