Improve User friendliness

Author: yccheok

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

@@ -2465,6 +2465,8 @@ private void refreshStatusBarExchangeRateVisibility() {
         }
 
         Set<CurrencyPair> currencyPairs = this.getCurrencyPairs();
+        // Special handling for GBX.
+        currencyPairs.remove(CurrencyPair.create("GBX", "GBP"));
 
         if (currencyPairs.isEmpty()) {
             mainFrame.setStatusBarExchangeRateVisible(false);
@@ -3023,14 +3025,30 @@ public PortfolioRealTimeInfo getPortfolioRealTimeInfo() {
         return this.portfolioRealTimeInfo;
     }
 
-    public boolean shouldDisplayCurrencyInfoForValue() {
+    public boolean shouldDisplayCurrencyInfoForValue(Code code) {
         final JStockOptions jStockOptions = JStock.getInstance().getJStockOptions();
         final Country country = jStockOptions.getCountry();
         final boolean isCurrencyExchangeEnable = jStockOptions.isCurrencyExchangeEnable(country);
         if (false == isCurrencyExchangeEnable) {
             return false;
         }
-        return !this.getCurrencyPairs().isEmpty();
+        
+        if (false == this.getCurrencyPairs().isEmpty()) {
+            final Currency stockCurrency = org.yccheok.jstock.portfolio.Utils.getStockCurrency(portfolioRealTimeInfo, code);
+            final Currency localCurrency = country.localCurrency;
+            if (stockCurrency.equals(localCurrency)) {
+                return false;
+            }
+            
+            // Special handling for GBX.
+            if (stockCurrency.toString().equals("GBX") && localCurrency.toString().equals("GBP")) {
+                return false;
+            }
+            
+            return true;
+        }
+        
+        return false;
     }
 
     private static final Log log = LogFactory.getLog(PortfolioManagementJPanel.class);

src/org/yccheok/jstock/gui/treetable/BuyPortfolioTreeTableModelEx.java

@@ -447,7 +447,7 @@ public Object getValueAt(Object node, int column) {
 
             final boolean shouldConvertPenceToPound = org.yccheok.jstock.portfolio.Utils.shouldConvertPenceToPound(portfolioRealTimeInfo, code);
 
-            final boolean shouldDisplayCurrencyInfoForValue = this.portfolioManagementJPanel.shouldDisplayCurrencyInfoForValue();
+            final boolean shouldDisplayCurrencyInfoForValue = this.portfolioManagementJPanel.shouldDisplayCurrencyInfoForValue(code);
 
             final Currency stockCurrency = shouldDisplayCurrencyInfoForValue ? org.yccheok.jstock.portfolio.Utils.getStockCurrency(portfolioRealTimeInfo, code) : null;
 
@@ -533,7 +533,7 @@ public Object getValueAt(Object node, int column) {
 
             final boolean shouldConvertPenceToPound = org.yccheok.jstock.portfolio.Utils.shouldConvertPenceToPound(portfolioRealTimeInfo, code);
 
-            final boolean shouldDisplayCurrencyInfoForValue = this.portfolioManagementJPanel.shouldDisplayCurrencyInfoForValue();
+            final boolean shouldDisplayCurrencyInfoForValue = this.portfolioManagementJPanel.shouldDisplayCurrencyInfoForValue(code);
 
             final Currency stockCurrency = shouldDisplayCurrencyInfoForValue ? org.yccheok.jstock.portfolio.Utils.getStockCurrency(portfolioRealTimeInfo, code) : null;
 

src/org/yccheok/jstock/gui/treetable/SellPortfolioTreeTableModelEx.java

@@ -291,7 +291,7 @@ public Object getValueAt(Object node, int column) {
 
             final boolean shouldConvertPenceToPound = org.yccheok.jstock.portfolio.Utils.shouldConvertPenceToPound(portfolioRealTimeInfo, code);
 
-            final boolean shouldDisplayCurrencyInfoForValue = this.portfolioManagementJPanel.shouldDisplayCurrencyInfoForValue();
+            final boolean shouldDisplayCurrencyInfoForValue = this.portfolioManagementJPanel.shouldDisplayCurrencyInfoForValue(code);
 
             final Currency stockCurrency = shouldDisplayCurrencyInfoForValue ? org.yccheok.jstock.portfolio.Utils.getStockCurrency(portfolioRealTimeInfo, code) : null;
 
@@ -389,7 +389,7 @@ public Object getValueAt(Object node, int column) {
 
             final boolean shouldConvertPenceToPound = org.yccheok.jstock.portfolio.Utils.shouldConvertPenceToPound(portfolioRealTimeInfo, code);
 
-            final boolean shouldDisplayCurrencyInfoForValue = this.portfolioManagementJPanel.shouldDisplayCurrencyInfoForValue();
+            final boolean shouldDisplayCurrencyInfoForValue = this.portfolioManagementJPanel.shouldDisplayCurrencyInfoForValue(code);
 
             final Currency stockCurrency = shouldDisplayCurrencyInfoForValue ? org.yccheok.jstock.portfolio.Utils.getStockCurrency(portfolioRealTimeInfo, code) : null;