JStock 1.0.7.34

Author: yccheok

docs/changelog.txt

@@ -1,6 +1,11 @@
 This file summarizes changes in JStock releases.
 Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX)
 
+JStock 1.0.7.34 - 2018-07--25
+  Feature: Show buy date in sell transaction.
+  Feature: Resizing is allowed for most dialogs.
+  Bugfix:  Remove DriveWealth service.
+
 JStock 1.0.7.33 - 2018-06-06
   Feature: Promote WeNote.
   Bugfix:  Prepare to terminate DriveWealth service.

installer/windows/jstock.nsi

@@ -12,7 +12,7 @@ Name ${PRODUCT_NAME}
 RequestExecutionLevel admin ;Workaround for Vista
 
 ; The file to write
-OutFile "jstock-1.0.7.33-setup.exe"
+OutFile "jstock-1.0.7.34-setup.exe"
 LicenseData "gpl-2.0.txt"
 
 ; The default installation directory

installer/windows/jstock.xml

@@ -26,12 +26,12 @@
     <maxHeapSize>512</maxHeapSize>
   </jre>
   <versionInfo>
-    <fileVersion>1.1.6.2</fileVersion>
-    <txtFileVersion>1.1.6.2</txtFileVersion>
+    <fileVersion>1.1.6.3</fileVersion>
+    <txtFileVersion>1.1.6.3</txtFileVersion>
     <fileDescription>JStock - Stock Market Software</fileDescription>
     <copyright>Yan Cheng Cheok &lt;[email protected]&gt;</copyright>
-    <productVersion>1.1.6.2</productVersion>
-    <txtProductVersion>1.1.6.2</txtProductVersion>
+    <productVersion>1.1.6.3</productVersion>
+    <txtProductVersion>1.1.6.3</txtProductVersion>
     <productName>JStock - Stock Market Software</productName>
     <companyName>Yan Cheng Cheok &lt;[email protected]&gt;</companyName>
     <internalName>jstock</internalName>

src/images/16x16/wenote.png

@@ -0,0 +1,42 @@
+/*
+ * JStock - Free Stock Market Software
+ * Copyright (C) 2018 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package org.yccheok.jstock.file;
+
+import java.io.File;
+
+/**
+ *
+ * @author yccheok
+ */
+public enum UserDataDirectory {
+    Android("android"),
+    Databases("databases"),
+    Config("config");
+    
+    UserDataDirectory(String directory) {
+        this.directory = directory;
+    }
+
+    public String get() {
+        return org.yccheok.jstock.gui.Utils.getUserDataDirectory() + this.directory + File.separator;
+    }
+
+    public final String directory;    
+}

src/org/yccheok/jstock/file/UserDataDirectory.java

@@ -0,0 +1,44 @@
+/*
+ * JStock - Free Stock Market Software
+ * Copyright (C) 2018 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package org.yccheok.jstock.file;
+
+/**
+ *
+ * @author yccheok
+ */
+public enum UserDataFile {
+    CashFlowChartJDialogXml("cashflowchartjdialog.xml"),
+    ChartJDialogOptionsXml("chartjdialogoptions.xml"),
+    IndicatorScannerJPanelXml("indicatorscannerjpanel.xml"),
+    MainFrameXml("mainframe.xml"),
+    OptionsXml("options.xml"),
+    PortfolioManagementJPanelXml("portfoliomanagementjpanel.xml"),
+    UIOptionsJson("uioptions.json");
+    
+    UserDataFile(String filename) {
+        this.filename = filename;
+    }
+
+    public String get() {
+        return this.filename;
+    }
+
+    private final String filename;
+}

src/org/yccheok/jstock/file/UserDataFile.java

@@ -10,16 +10,18 @@
     <Property name="title" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
       <ResourceString bundle="org/yccheok/jstock/data/gui.properties" key="FairUsagePolicyJDialog_Title" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
     </Property>
-    <Property name="resizable" type="boolean" value="false"/>
   </Properties>
   <SyntheticProperties>
-    <SyntheticProperty name="formSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,34,0,0,1,77"/>
+    <SyntheticProperty name="formSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,121,0,0,1,-88"/>
     <SyntheticProperty name="formPosition" type="java.awt.Point" value="-84,-19,0,5,115,114,0,14,106,97,118,97,46,97,119,116,46,80,111,105,110,116,-74,-60,-118,114,52,126,-56,38,2,0,2,73,0,1,120,73,0,1,121,120,112,0,0,0,0,0,0,0,0"/>
     <SyntheticProperty name="formSizePolicy" type="int" value="0"/>
     <SyntheticProperty name="generatePosition" type="boolean" value="true"/>
     <SyntheticProperty name="generateSize" type="boolean" value="true"/>
     <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
+  <Events>
+    <EventHandler event="windowClosed" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="formWindowClosed"/>
+  </Events>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
@@ -118,7 +120,7 @@
                           <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
                       </Group>
                   </Group>
-                  <EmptySpace pref="80" max="32767" attributes="0"/>
+                  <EmptySpace pref="60" max="32767" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -135,7 +137,7 @@
                       <Component id="jSpinner1" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
-                  <EmptySpace pref="21" max="32767" attributes="0"/>
+                  <EmptySpace pref="20" max="32767" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>

src/org/yccheok/jstock/gui/FairUsagePolicyJDialog.form

@@ -19,6 +19,7 @@
 
 package org.yccheok.jstock.gui;
 
+import java.awt.Dimension;
 import java.awt.event.ItemEvent;
 
 /**
@@ -51,7 +52,14 @@ public FairUsagePolicyJDialog(java.awt.Frame parent, boolean modal) {
 
         // Hackish way to make Mac works.
         pack();        
-        setSize(new java.awt.Dimension(333, 290));
+        
+        Dimension dimension = JStock.instance().getUIOptions().getDimension(UIOptions.FAIR_USAGE_POLICY_JDIALOG);
+        if (dimension != null) {
+            setSize(dimension);
+        } else {
+            setSize(new java.awt.Dimension(424, 377));    
+        }        
+        
         setLocationRelativeTo(null);
     }
 
@@ -79,7 +87,11 @@ private void initComponents() {
         setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
         java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("org/yccheok/jstock/data/gui"); // NOI18N
         setTitle(bundle.getString("FairUsagePolicyJDialog_Title")); // NOI18N
-        setResizable(false);
+        addWindowListener(new java.awt.event.WindowAdapter() {
+            public void windowClosed(java.awt.event.WindowEvent evt) {
+                formWindowClosed(evt);
+            }
+        });
         getContentPane().setLayout(new java.awt.BorderLayout(5, 5));
 
         jXHeader1.setDescription(bundle.getString("FairUsagePolicyJDialog_Description")); // NOI18N
@@ -139,7 +151,7 @@ public void itemStateChanged(java.awt.event.ItemEvent evt) {
                         .addComponent(jSpinner1, javax.swing.GroupLayout.PREFERRED_SIZE, 61, javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                         .addComponent(jLabel1)))
-                .addContainerGap(80, Short.MAX_VALUE))
+                .addContainerGap(60, Short.MAX_VALUE))
         );
         jPanel1Layout.setVerticalGroup(
             jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -153,12 +165,12 @@ public void itemStateChanged(java.awt.event.ItemEvent evt) {
                     .addComponent(jRadioButton3)
                     .addComponent(jSpinner1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(jLabel1))
-                .addContainerGap(21, Short.MAX_VALUE))
+                .addContainerGap(20, Short.MAX_VALUE))
         );
 
         getContentPane().add(jPanel1, java.awt.BorderLayout.CENTER);
 
-        setBounds(0, 0, 333, 290);
+        setBounds(0, 0, 424, 377);
     }// </editor-fold>//GEN-END:initComponents
 
     private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
@@ -183,6 +195,10 @@ private void jRadioButton3ItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-
         this.jSpinner1.setEnabled(evt.getStateChange() == ItemEvent.SELECTED);
     }//GEN-LAST:event_jRadioButton3ItemStateChanged
 
+    private void formWindowClosed(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowClosed
+        JStock.instance().getUIOptions().setDimension(UIOptions.FAIR_USAGE_POLICY_JDIALOG, getSize());
+    }//GEN-LAST:event_formWindowClosed
+
     /**
      * @param args the command line arguments
      */

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

@@ -35,9 +35,10 @@
 import org.yccheok.jstock.analysis.*;
 import org.yccheok.jstock.analysis.Indicator;
 import org.yccheok.jstock.engine.*;
+import org.yccheok.jstock.file.UserDataDirectory;
+import org.yccheok.jstock.file.UserDataFile;
 import org.yccheok.jstock.gui.trading.TradingView;
 import org.yccheok.jstock.internationalization.GUIBundle;
-import org.yccheok.jstock.internationalization.MessagesBundle;
 
 /**
  *
@@ -202,7 +203,7 @@ private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
      * Initialize GUI options of this indicator scanner panel.
      */
     public void initGUIOptions() {
-        File f = new File(org.yccheok.jstock.gui.Utils.getUserDataDirectory() + "config" + File.separator + "indicatorscannerjpanel.xml");
+        File f = new File(UserDataDirectory.Config.get() + UserDataFile.IndicatorScannerJPanelXml.get());
         GUIOptions guiOptions = org.yccheok.jstock.gui.Utils.fromXML(GUIOptions.class, f);
 
         if (guiOptions == null)
@@ -230,7 +231,7 @@ public void initGUIOptions() {
 	}
 
     public boolean saveGUIOptions() {
-        if(Utils.createCompleteDirectoryHierarchyIfDoesNotExist(org.yccheok.jstock.gui.Utils.getUserDataDirectory() + "config") == false)
+        if(Utils.createCompleteDirectoryHierarchyIfDoesNotExist(UserDataDirectory.Config.get()) == false)
         {
             return false;
         }
@@ -247,7 +248,7 @@ public boolean saveGUIOptions() {
         final GUIOptions guiOptions = new GUIOptions();
         guiOptions.addJTableOptions(jTableOptions);
 
-        File f = new File(org.yccheok.jstock.gui.Utils.getUserDataDirectory() + "config" + File.separator + "indicatorscannerjpanel.xml");
+        File f = new File(UserDataDirectory.Config.get() + UserDataFile.IndicatorScannerJPanelXml.get());
         return org.yccheok.jstock.gui.Utils.toXML(guiOptions, f);
     }
 
@@ -1159,15 +1160,6 @@ public void actionPerformed(ActionEvent evt) {
             final IndicatorTableModel tableModel = (IndicatorTableModel)jTable1.getModel();
             final Indicator indicator = tableModel.getIndicator(modelIndex);
             final Stock stock = indicator.getStock();
-            if (JStock.instance().isDriveWealthCodes(stock.code)) {
-                menuItem = new JMenuItem(java.util.ResourceBundle.getBundle("org/yccheok/jstock/data/gui").getString("MainFrame_DriveWealthBuy..."), this.getImageIcon("/images/16x16/drivewealth_logo.png"));    
-                
-                menuItem.addActionListener((ActionEvent evt) -> {
-                    TradingView.getInstance().showBuyDialog(stock.code.toString());
-                });
-
-                popup.add(menuItem);
-            }
         }
 
         return popup;