...

Author: yccheok

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

@@ -539,6 +539,7 @@ private static String[] getPriceSourceEntryValues(Country country) {
     static {
         priceSourceEntries.put(PriceSource.Yahoo.name(), GUIBundle.getString("OptionsNetworkJPanel_YahooFinance"));
         priceSourceEntries.put(PriceSource.Google.name(), GUIBundle.getString("OptionsNetworkJPanel_GoogleFinance"));
+        priceSourceEntries.put(PriceSource.IEX.name(), GUIBundle.getString("OptionsNetworkJPanel_IEX"));
     }
 
     // Variables declaration - do not modify//GEN-BEGIN:variables

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

@@ -2736,11 +2736,11 @@ public ApplicationInfo(int applicationVersionID, String windowsDownloadLink, Str
 
     ////////////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////////////
-    private static final String ABOUT_BOX_VERSION_STRING = "1.0.7.28";
+    private static final String ABOUT_BOX_VERSION_STRING = "1.0.7.29";
 
-    // 1.0.7.28
+    // 1.0.7.29
     // For About box comparision on latest version purpose.
-    private static final int APPLICATION_VERSION_ID = 1157;
+    private static final int APPLICATION_VERSION_ID = 1158;
     ////////////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////////////
 

src/org/yccheok/jstock/gui/portfolio/DividendSummaryJDialog.java

@@ -575,50 +575,23 @@ public Map<Code, List<Dividend>> doInBackground() {
                 final TransactionSummary transactionSummary = transactionSummaries.get(i);
                 final Code code = ((Transaction)transactionSummary.getChildAt(0)).getStockInfo().code;
                 Dividend latestDividend = org.yccheok.jstock.portfolio.Utils.getLatestDividend(dividendSummary, code);                
-
-                final Duration duration;
-
-                SimpleDate date = null;
-                
-                if (latestDividend == null) {
-                    for (int j = 0, ej = transactionSummary.getChildCount(); j < ej; j++) {
-                        Transaction transaction = (Transaction)transactionSummary.getChildAt(j);
-                        SimpleDate simpleDate = transaction.getContract().getDate();
-                        if (date == null) {
-                            date = simpleDate;
-                        } else {
-                            if (date.compareTo(simpleDate) > 0) {
-                                date = simpleDate;
-                            }
-                        }
-                    }
-                } else {
-                    date = latestDividend.date;
-                }
-                
-                Calendar c = date.getCalendar();
-                c.add(Calendar.DATE, 1);
-                SimpleDate startDate = new SimpleDate(c);
-                SimpleDate endDate = new SimpleDate();
-                if (startDate.compareTo(endDate) > 0) {
-                    this.setProgress(i + 1);
-                    continue;
-                }                
-                duration = new Duration(startDate, endDate);
-                
-                List<Dividend> suggestedDividends = new ArrayList<Dividend>();
+                                
+                List<Dividend> suggestedDividends = new ArrayList<>();
                 for (StockServerFactory stockServerFactory : Factories.INSTANCE.getStockServerFactories(code)) {
                     if (isCancelled()) {
                         break;
                     }
 
                     DividendServer dividendServer = stockServerFactory.getDividendServer();
                     if (dividendServer != null) {
-                        List<Dividend> dividends = dividendServer.getDividends(code, duration);
-                        for (Dividend dividend : dividends) {
-                            if (false == duration.isContains(dividend.date)) {
-                                continue;
+                        List<Dividend> dividends = dividendServer.getDividends(code);
+                        for (Dividend dividend : dividends) {                            
+                            if (latestDividend != null) {
+                                if (latestDividend.date.compareTo(dividend.date) >= 0) {
+                                    continue;
+                                }
                             }
+                            
                             double total = dividend.amount * quantityQuery.getBalance(code, dividend.date);
                             if (total == 0) {
                                 continue;