Merge pull request #16 from mogray5/infinitypfm_080

Infinitypfm 080
mogray5 · Jan 1, 2019 · 8b67c4d · 8b67c4d
2 parents 05223f6 + b73c29e
commit 8b67c4d
Show file tree

Hide file tree

Showing 40 changed files with 557 additions and 322 deletions.
diff --git a/appimage/AppRun b/appimage/AppRun
@@ -2,7 +2,8 @@
 
 set -x
 HERE="$(dirname "$(readlink -f "${0}")")"
-export PATH="${HERE}"/usr/bin/:"${HERE}"/usr/sbin/:"${HERE}"/usr/games/:"${HERE}"/bin/:"${HERE}"/sbin/:"${PATH}"
+export JAVA_HOME="${HERE}"/usr/lib/java-1.8.0-openjdk-amd64;
+export PATH="${HERE}"/usr/bin/:"${HERE}"/usr/sbin/:"${HERE}"/usr/games/:"${HERE}"/bin/:"${HERE}"/sbin/:"${JAVA_HOME}"/bin/:${PATH}
 export LD_LIBRARY_PATH="${HERE}"/usr/lib/:"${HERE}"/usr/lib/i386-linux-gnu/:"${HERE}"/usr/lib/x86_64-linux-gnu/:"${HERE}"/usr/lib32/:"${HERE}"/usr/lib64/:"${HERE}"/lib/:"${HERE}"/lib/i386-linux-gnu/:"${HERE}"/lib/x86_64-linux-gnu/:"${HERE}"/lib32/:"${HERE}"/lib64/:"${LD_LIBRARY_PATH}"
 export PYTHONPATH="${HERE}"/usr/share/pyshared/:"${PYTHONPATH}"
 export XDG_DATA_DIRS="${HERE}"/usr/share/:"${XDG_DATA_DIRS}"
@@ -11,7 +12,7 @@ export GSETTINGS_SCHEMA_DIR="${HERE}"/usr/share/glib-2.0/schemas/:"${GSETTINGS_S
 export QT_PLUGIN_PATH="${HERE}"/usr/lib/qt4/plugins/:"${HERE}"/usr/lib/i386-linux-gnu/qt4/plugins/:"${HERE}"/usr/lib/x86_64-linux-gnu/qt4/plugins/:"${HERE}"/usr/lib32/qt4/plugins/:"${HERE}"/usr/lib64/qt4/plugins/:"${HERE}"/usr/lib/qt5/plugins/:"${HERE}"/usr/lib/i386-linux-gnu/qt5/plugins/:"${HERE}"/usr/lib/x86_64-linux-gnu/qt5/plugins/:"${HERE}"/usr/lib32/qt5/plugins/:"${HERE}"/usr/lib64/qt5/plugins/:"${QT_PLUGIN_PATH}"
 EXEC=$(grep -e '^Exec=.*' "${HERE}"/*.desktop | head -n 1 | cut -d "=" -f 2 | cut -d " " -f 1)
 #exec "${EXEC}" $@
-export JAVA_HOME="${HERE}"/usr/lib/java-1.8.0-openjdk-amd64;
+
 
 java -Djava.library.path="${HERE}"/usr/lib -cp "${HERE}/usr/lib/*" org.infinitypfm.client.InfinityPfm
 

diff --git a/appimage/create_appimage.sh b/appimage/create_appimage.sh
@@ -5,9 +5,16 @@ echo -e "\n
 Enter release version to use when naming the app image: \n"
 read response
 
-sudo apt-get install libibatis-java libcommons-io-java libcommons-compress-java libhsqldb-java libgettext-commons-java libcommons-httpclient-java libjson-java libmail-java libcommons-csv-java
-sudo apt-get install libswt-gtk-3-java libswt-webkit-gtk-3-jni libswt-cairo-gtk-3-jni
-sudo apt-get install bzr ant default-jdk
+echo -e "\n
+Install required libraries? (y|n): \n"
+read doinstall
+
+if [[ "${doinstall}" == *"y"* ]]
+then
+	sudo apt-get install libibatis-java libcommons-io-java libcommons-compress-java libhsqldb-java libgettext-commons-java libcommons-httpclient-java libjson-java libmail-java libcommons-csv-java
+	sudo apt-get install libswt-gtk-3-java libswt-webkit-gtk-3-jni libswt-cairo-gtk-3-jni	
+	sudo apt-get install ant default-jdk
+fi
 
 mkdir -p infinitypfm.AppDir/usr/bin
 mkdir -p infinitypfm.AppDir/usr/lib
@@ -34,13 +41,14 @@ cp -L /usr/share/java/commons-lang.jar infinitypfm.AppDir/usr/lib/;
 cp -L /usr/share/java/ezmorph.jar infinitypfm.AppDir/usr/lib/;
 cp -L /usr/share/java/commons-collections3.jar infinitypfm.AppDir/usr/lib/;
 cp -L /usr/share/java/hsqldb.jar infinitypfm.AppDir/usr/lib/;
+cp -L /usr/share/java/junit4.jar infinitypfm.AppDir/usr/lib/;
 cp -L /usr/lib/jni/libswt-cairo-gtk-3836.so infinitypfm.AppDir/usr/lib/;
 cp -L /usr/lib/jni/libswt-atk-gtk-3836.so infinitypfm.AppDir/usr/lib/;
 cp -L /usr/lib/jni/libswt-awt-gtk-3836.so infinitypfm.AppDir/usr/lib/;
 cp -L /usr/lib/jni/libswt-gtk-3836.so infinitypfm.AppDir/usr/lib/;
 cp -L /usr/lib/jni/libswt-pi-gtk-3836.so infinitypfm.AppDir/usr/lib/;
 cp -L /usr/lib/jni/libswt-webkit-gtk-3836.so infinitypfm.AppDir/usr/lib/;
-cp -L /usr/shre/java/mailapi.jar infinitypfm.AppDir/usr/lib/;
+cp -L /usr/share/java/mailapi.jar infinitypfm.AppDir/usr/lib/;
 cp -L /usr/share/java/commons-csv.jar infinitypfm.AppDir/usr/lib/;
 cp -L -R /usr/lib/jvm/java-1.8.0-openjdk-amd64 infinitypfm.AppDir/usr/lib/;
 

diff --git a/archive/create_archive.sh b/archive/create_archive.sh
@@ -0,0 +1,71 @@
+# Pre-Step - Download SWT 3.8.2 for Windows 64bit.
+#http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/download.php?dropFile=swt-3.8.2-win32-win32-x86_64.zip
+
+WIN_SWT_LOCAL=/tmp/swt-3.8.2-win32-win32-x86_64
+
+# Create Archive Bundle on Ubuntu 18.04 LTS
+
+echo -e "\n
+Enter release version to use when naming the archive: \n"
+read response
+
+echo -e "\n
+Install required libraries? (y|n): \n"
+read doinstall
+
+rm -rf infinitypfm.archive
+rm -rf infinitypfm-$response
+rm infinitypfm-$response.zip
+
+if [[ "${doinstall}" == *"y"* ]]
+then
+	sudo apt install libibatis-java libcommons-io-java libcommons-compress-java libhsqldb-java libgettext-commons-java libcommons-httpclient-java libjson-java libmail-java libcommons-csv-java
+	sudo apt install libswt-gtk-3-java libswt-webkit-gtk-3-jni libswt-cairo-gtk-3-jni	
+	sudo apt install ant default-jdk
+fi
+
+mkdir -p infinitypfm.archive/bin
+mkdir -p infinitypfm.archive/lib
+
+ant
+
+cp archive/infinitypfm.bat infinitypfm.archive/bin;
+cp archive/infinitypfm.sh infinitypfm.archive/bin;
+chmod a+x infinitypfm.archive/bin;
+#cp infinitypfm-ui/infinitypfm.desktop infinitypfm.archive/;
+#cp infinitypfm-ui/infinitypfm.xpm infinitypfm.archive/;
+cp *.jar infinitypfm.archive/lib/;
+cp -L /usr/share/java/swt.jar infinitypfm.archive/lib/;
+cp -L $WIN_SWT_LOCAL/swt.jar infinitypfm.archive/lib/swt_win.jar;
+cp -L /usr/share/java/ibatis.jar infinitypfm.archive/lib/;
+cp -L /usr/share/java/commons-io.jar infinitypfm.archive/lib/;
+cp -L /usr/share/java/commons-compress.jar infinitypfm.archive/lib/;
+cp -L /usr/share/java/commons-codec.jar infinitypfm.archive/lib/;
+cp -L /usr/share/java/gettext-commons.jar infinitypfm.archive/lib/;
+cp -L /usr/share/java/commons-httpclient.jar infinitypfm.archive/lib/;
+cp -L /usr/share/java/commons-beanutils.jar infinitypfm.archive/lib/;
+cp -L /usr/share/java/commons-configuration.jar infinitypfm.archive/lib/;
+cp -L /usr/share/java/commons-logging.jar infinitypfm.archive/lib/;
+cp -L /usr/share/java/json-lib.jar infinitypfm.archive/lib/;
+cp -L /usr/share/java/commons-lang.jar infinitypfm.archive/lib/;
+cp -L /usr/share/java/ezmorph.jar infinitypfm.archive/lib/;
+cp -L /usr/share/java/commons-collections3.jar infinitypfm.archive/lib/;
+cp -L /usr/share/java/hsqldb.jar infinitypfm.archive/lib/;
+cp -L /usr/share/java/junit.jar infinitypfm.archive/lib/;
+cp -L /usr/lib/jni/libswt-cairo-gtk-3836.so infinitypfm.archive/lib/;
+cp -L /usr/lib/jni/libswt-atk-gtk-3836.so infinitypfm.archive/lib/;
+cp -L /usr/lib/jni/libswt-awt-gtk-3836.so infinitypfm.archive/lib/;
+cp -L /usr/lib/jni/libswt-gtk-3836.so infinitypfm.archive/lib/;
+cp -L /usr/lib/jni/libswt-pi-gtk-3836.so infinitypfm.archive/lib/;
+cp -L /usr/lib/jni/libswt-webkit-gtk-3836.so infinitypfm.archive/lib/;
+cp -L /usr/share/java/mailapi.jar infinitypfm.archive/lib/;
+cp -L /usr/share/java/commons-csv.jar infinitypfm.archive/lib/;
+#cp -L -R /usr/lib/jvm/java-1.8.0-openjdk-amd64 infinitypfm.archive/lib/;
+
+#cp infinitypfm.run infinitypfm.archive/usr/bin/infinitypfm
+
+# appimagetool-x86_64.AppImage infinitypfm.archive infinitypfm-"$response".AppImage generate
+
+mv infinitypfm.archive infinitypfm-$response
+zip  -r infinitypfm-$response.zip infinitypfm-$response/bin infinitypfm-$response/lib
+
diff --git a/archive/infinitypfm.bat b/archive/infinitypfm.bat
@@ -0,0 +1,2 @@
+del ..\lib\swt.jar
+java -cp "..\lib\*" org.infinitypfm.client.InfinityPfm
diff --git a/archive/infinitypfm.sh b/archive/infinitypfm.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -x
+
+rm lib/swt_win.jar
+java -Djava.library.path="lib" -cp "lib/*" org.infinitypfm.client.InfinityPfm
+
+set +x
diff --git a/build.xml b/build.xml
@@ -10,15 +10,20 @@
     <delete>
 	<fileset  dir=".">
 	 <include name="infinitypfm-*.AppImage" />
+	<include name="infinitypfm-*.zip" />
+	<include name="TEST*.txt" />
+	<include name="TEST*.xml" />
 	</fileset>
     </delete>
     <delete dir="infinitypfm-flatpak" />
+    <delete dir="infinitypfm-0.8.0" />
+    <delete dir="infinitypfm.archive" />
 </target>
 
 <target name="compile" depends="compileUI" />
 
 <target name="compileCommon">
-    <ant antfile="infinitypfm-common/build.xml" target="compile" />
+    <ant antfile="infinitypfm-common/build.xml" target="junit" />
 </target>
 <target name="compileBTC" depends="compileCommon">
     <ant antfile="infinitypfm-btc/build.xml" target="compile" />

diff --git a/debian/control b/debian/control
@@ -12,7 +12,8 @@ Build-Depends-Indep: default-jdk,
  libhsqldb-java,
  libgettext-commons-java,
  libcommons-httpclient-java,
- libjson-java
+ libjson-java,
+ junit
 Standards-Version: 3.9.8
 Homepage: http://infinitypfm.org/
 Section: gnome

diff --git a/debian/infinitypfm-ui.classpath b/debian/infinitypfm-ui.classpath
@@ -0,0 +1 @@
+infinitypfm-ui.jar /usr/share/java/swt.jar /usr/share/java/hsqldb.jar /usr/share/java/ibatis.jar /usr/share/java/commons-io.jar /usr/share/java/commons-compress.jar /usr/share/java/gettext-commons.jar /usr/share/java/commons-httpclient.jar /usr/share/java/commons-beanutils.jar /usr/share/java/commons-logging.jar /usr/share/java/json-lib.jar /usr/share/java/commons-lang.jar /usr/share/java/ezmorph.jar /usr/share/java/commons-collections3.jar /usr/share/java/commons-configuration.jar /usr/share/java/commons-csv.jar /usr/share/java/commons-codec.jar /usr/share/java/infinitypfm-btc.jar /usr/share/java/infinitypfm-common.jar
diff --git a/debian/infinitypfm-ui.install b/debian/infinitypfm-ui.install
@@ -1,2 +1,2 @@
-infinitypfm/infinitypfm.desktop /usr/share/applications
-infinitypfm/infinitypfm.xpm /usr/share/pixmaps
+infinitypfm-ui/infinitypfm.desktop /usr/share/applications
+infinitypfm-ui/infinitypfm.xpm /usr/share/pixmaps
diff --git a/infinitypfm-common/build.xml b/infinitypfm-common/build.xml
@@ -1,10 +1,18 @@
 <?xml version="1.0"?>
-<project name="pkg-java" default="compile" basedir=".">
+<project name="pkg-java" default="junit" basedir=".">
 	<property name="build.sourceDirectory" value="infinitypfm-common/src/main/java" />
+	<property name="build.testDir" value="infinitypfm-common/src/test/java" />
 	<property name="build.directory" value="build" />
 	<property name="build.outputDirectory" value="${build.directory}/classes" />
-	<property name="classpath" value="/usr/share/java/commons-codec.jar:/usr/share/java/commons-lang.jar:/usr/share/java/gettext-commons.jar:/usr/share/java/jackson-core-lgpl.jar:/usr/share/java/mailapi.jar" />
+	<property name="classpath" value="/usr/share/java/commons-codec.jar:/usr/share/java/commons-lang.jar:/usr/share/java/gettext-commons.jar:/usr/share/java/jackson-core-lgpl.jar:/usr/share/java/mailapi.jar:/usr/share/java/junit4.jar:/usr/share/java/hamcrest-core-1.3.jar" />
 	<property name="jar" value="infinitypfm-common.jar" />
+
+	<path id="src.path">
+	  <pathelement location="${build.sourceDirectory}" />
+	  <pathelement location="${build.testDir}" />
+	</path>
+
+
 	<target name="clean">
 		<delete dir="${build.directory}" />
 		<delete file="${jar}" />
@@ -31,7 +39,8 @@
 		<antcall target="getres">
 			<param name="local" value="es"/>
 		</antcall>
-		<javac srcdir="${build.sourceDirectory}" destdir="${build.outputDirectory}" nowarn="true" debug="on">
+		<javac destdir="${build.outputDirectory}" nowarn="true" debug="on">
+			<src refid="src.path" />
 			<classpath path="${classpath}" />
 		</javac>
 		<jar jarfile="${jar}" basedir="${build.outputDirectory}" />
@@ -50,4 +59,28 @@
 			<arg value="${build.sourceDirectory}/org/infinitypfm/core/lang/po/${local}.po" />
 		</exec>
 	</target>
+	<target name="junit" depends="compile">
+
+		  <junit printsummary="yes" haltonfailure="no">
+
+			<!--
+				<classpath location="lib/junit-4.11.jar" />
+				<classpath location="lib/hamcrest-core-1.3.jar" />
+				<classpath refid="test.path" /
+			-->
+
+			<classpath location="${classpath}" />
+			<classpath refid="src.path" />
+
+			<formatter type="xml" />
+			<formatter type="plain" />
+
+			<batchtest fork="yes" todir=".">
+				<fileset dir="${build.testDir}">
+					<include name="**/*Test*.java" />
+				</fileset>
+			</batchtest>
+
+		  </junit>
+	</target>
 </project>
diff --git a/infinitypfm-common/project.xml b/infinitypfm-common/project.xml
@@ -12,6 +12,7 @@
         <pathelement location="/usr/share/java/commons-lang.jar"/>
         <pathelement location="/usr/share/java/gettext-commons.jar"/>
         <pathelement location="/usr/share/java/jackson-core-lgpl.jar"/>
+    	<pathelement location="/usr/share/java/junit.jar"/>
     </path>
     <target name="init">
         <mkdir dir="bin"/>

diff --git a/infinitypfm-common/src/main/java/org/infinitypfm/core/conf/LangInstance.java b/infinitypfm-common/src/main/java/org/infinitypfm/core/conf/LangInstance.java
@@ -18,6 +18,12 @@
  */
 package org.infinitypfm.core.conf;
 
+/**
+ * Singleton for loading translations.
+ *
+ *	TODO:  This should replace MM.phrases
+ *
+ */
 public class LangInstance {
 
 	private static LangInstance instance = null;
@@ -31,15 +37,12 @@ public static LangInstance getInstance() {
 
 		 if (instance == null) {
 			 instance = new LangInstance();
-
 		 }
 
 		 return instance;
-
 	 }
 
 	 public String getPhrase(String index) {
-
 		 return this.lang.getPhrase(index);
 	 }
 

diff --git a/infinitypfm-common/src/main/java/org/infinitypfm/core/conf/LangLoader.java b/infinitypfm-common/src/main/java/org/infinitypfm/core/conf/LangLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2017 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2018 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -26,6 +26,9 @@
 
 
 /**
+ * This class loads a HashMap of words and phrases in the user's local language and is
+ * referenced throughout the application.  
+ * 
  * @author Wayne Gray
  */
 public class LangLoader {

diff --git a/infinitypfm-common/src/main/java/org/infinitypfm/core/conf/PfmSettings.java b/infinitypfm-common/src/main/java/org/infinitypfm/core/conf/PfmSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2012 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2018 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -19,62 +19,29 @@
 
 package org.infinitypfm.core.conf;
 
-import java.io.File;
-
-
 /**
- * @author wayne
+ * Common settings used in infinitypfm-common.
+ * 
+ * @author Wayne Gray
  *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class PfmSettings {
 
 	/*
-	 * Program Constants
+	 * Lookup key for Weekly transaction recurrence phrase.
 	 */
-	public static final String APPTITLE = "Infinity PFM";
-	public static final String APPVERSION = "0.7.0";
-	public static final String APPLINK = "https://www.infinitypfm.org";
-	public static final String APPLICENCE = "GNU General Public License v3";
-	public static final String APPCOPYRIGHT = "(c) 2005-2013 by Wayne Gray";
-	//public static final String APPPATH = System.getProperty("INFINITYPFM_HOME") + File.separator;
-	public static final String APPPATH = "blah";
-
-	public static final String ACT_TYPE_EXPENSE = "Expense";
-	public static final String ACT_TYPE_LIABILITY = "Liability";
-	public static final String ACT_TYPE_INCOME = "Income";
-
-	//public static String DATPATH = System.getProperty("INFINITYPFM_DATA") + File.separator;
-	public static String DATPATH = "/var/lib/infinitypfm";
-	public static String HELPPATH = "file://///" + PfmSettings.APPPATH + 
-	 	"docs" + File.separator + "index.html";
-	public static String REPORTFOLDERURL = "file://///" + PfmSettings.APPPATH + 
- 	"reports" + File.separator;
-	public static String REPORTFOLDER = PfmSettings.APPPATH + 
- 	"reports" + File.separator;
-
-	public static String MOCK_FOLDER = "/tmp/";
-
 	public static final String RECUR_WEEKLY = "147";
+	/*
+	 * Lookup key for Bi-weekly transaction recurrence phrase.
+	 */
 	public static final String RECUR_BIWEEKLY = "149";
+	/*
+	 * Lookup key for Monthly transaction recurrence phrase.
+	 */
 	public static final String RECUR_MONTHLY = "146";
+	/*
+	 * Lookup key for Annual transaction recurrence phrase.
+	 */
 	public static final String RECUR_YEARLY = "148";
 
-	public static final int THIS_MONTH = 4;
-    public static final int LAST_MONTH = 5;
-
-    public static final int MENU_REPORTS_MONTHLY_BALANCE = 100;
-	public static final int MENU_REPORTS_PRIOR_MONTHLY_BALANCE = 101;
-	public static final int MENU_REPORTS_ACCOUNT_HISTORY = 102;
-	public static final int MENU_REPORTS_BUDGET_PERFORMANCE = 103;
-	public static final int MENU_REPORTS_BUDGET_PERFORMANCE_ACT = 104;
-	public static final int MENU_REPORTS_INCOME_VS_EXPENSE = 105;
-
-	public static final String REPORT_MONTHLY_BALANCES = "getReportMonthlyBalances";
-	public static final String REPORT_ACCOUNT_HISTORY = "getReportAccountHistory";
-	public static final String REPORT_BUDGET_VS_EXPENSE = "getBudgetVsExpenseByMonth";
-	public static final String REPORT_BUDGET_VS_EXPENSE_MONTHLY = "getBudgetVsExpenseByMonthAndAccount";
-	public static final String REPORT_INCOME_VS_EXPENSE = "getIncomeVsExpense";
-
 }