Merge lp:infinitypfm/0.7 into lp:infinitypfm/trunk

[mogray]

[mogray (mogray5)]

Merge 0.7 into trunk

[mogray (mogray5)]

review: Approve

[lp:infinitypfm/0.7]

67. By mogray on 2014-11-27

merge from 0.7

=== removed file 'DOC/images/infinitylogo2.png'
Binary files DOC/images/infinitylogo2.png	2012-03-21 00:23:47 +0000 and DOC/images/infinitylogo2.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'infinitypfm/.classpath'
--- infinitypfm/.classpath	2012-08-26 22:11:17 +0000
+++ infinitypfm/.classpath	2014-11-27 22:23:48 +0000
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/usr/share/java/swt.jar"/>
 	<classpathentry kind="lib" path="/usr/share/java/hsqldb.jar"/>
 	<classpathentry kind="lib" path="/usr/share/java/hsqldbutil.jar"/>
 	<classpathentry kind="lib" path="/usr/share/java/ibatis.jar"/>
@@ -17,5 +16,7 @@
 	<classpathentry kind="lib" path="/usr/share/java/commons-lang.jar"/>
 	<classpathentry kind="lib" path="/usr/share/java/ezmorph.jar"/>
 	<classpathentry kind="lib" path="/usr/share/java/commons-collections3.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/swt.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/ant.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

=== modified file 'infinitypfm/debbootstrap.txt'
--- infinitypfm/debbootstrap.txt	2012-12-02 04:37:54 +0000
+++ infinitypfm/debbootstrap.txt	2014-11-27 22:23:48 +0000
@@ -1,9 +1,3 @@
-sudo apt-get install openjdk-6-jre-headless
-sudo apt-get install libswt-gtk-3.5-java libswt-mozilla-gtk-3.5-jni libhsqldb-java libibatis-java libxerces2-java libcommons-io-java libcommons-compress-java libjson-java
-
-core: libhsqldb-java, libibatis-java, libxerces2-java, libcommons-io-java, libcommons-compress-java
-ui: libswt-gtk-3.5-java libswt-mozilla-gtk-3.5-jni, libhsqldb-java, libibatis-java, libxerces2-java, libcommons-io-java
-
 UBUNTU
 
 debuild -us -uc #unsigned
@@ -11,6 +5,7 @@
 dput ppa:mogray5/ppa-infinitypfm <source.changes> #upload to ppa
 sign files:  gpg -r [e-mail] --armor --sign --detach-sig <filename>.
 
+
 sudo apt-get install gettext
 
 xgettext -ktrc:1c,2 -ktrnc:1c,2,3 -ktr -kmarktr -ktrn:1,2 -o org/infinitypfm/core/po/infinitypfm.pot org/infinitypfm/core/conf/LangLoader.java
@@ -24,6 +19,13 @@
     debian-el devscripts devscripts-el dh-make dpatch dpkg-awk \
     dpkg-dev dpkg-dev-el equivs fakeroot lintian quilt sbuild javahelper ant
 
+apt-get install build-essential devscripts javahelper ant equivs
+
+#Install dependencies from control file
+mk-build-deps --install debian/control
+
+pbuilder-dist lucid build infinitypfm-ui_0.7.0-2ppa2.dsc
+
 java -cp /usr/share/java/hsqldb.jar org.hsqldb.util.DatabaseManagerSwing
 
 ...or...

=== modified file 'infinitypfm/debian/changelog'
--- infinitypfm/debian/changelog	2012-12-07 02:42:24 +0000
+++ infinitypfm/debian/changelog	2014-11-27 22:23:48 +0000
@@ -1,3 +1,9 @@
+infinitypfm-ui (0.7.0-1ppa1) precise; urgency=low
+
+  * Fix for lp:1121332 Bitcoin import not working with version 0.7.2
+ 
+ -- Wayne Gray <[e-mail]>  Mon, 11 Feb 2013 19:57:00 -0000
+
 infinitypfm-ui (0.6.0-5ppa1) precise; urgency=low
 
   * Split transaction support

=== modified file 'infinitypfm/debian/control'
--- infinitypfm/debian/control	2012-09-09 14:35:10 +0000
+++ infinitypfm/debian/control	2014-11-27 22:23:48 +0000
@@ -17,6 +17,9 @@
 
 Package: infinitypfm-ui
 Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}, libswt-mozilla-gtk-3.5-jni | libswt-webkit-gtk-3-jni | libswt-webkit-gtk-3.6-jni
+Depends: ${java:Depends},
+	${misc:Depends},
+	libswt-mozilla-gtk-3.5-jni | libswt-webkit-gtk-3-jni | libswt-webkit-gtk-3.6-jni,
+	libswt-cairo-gtk-3-jni | libswt-cairo-gtk-3.5-jni
 Description: Desktop client for Infinity PFM
  Infinity PFM is personal finance manager with support for budgets, OFX/QIF/QFX import, color reports and charts.

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/client/InfinityPfm.java'
--- infinitypfm/src/main/java/org/infinitypfm/client/InfinityPfm.java	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/client/InfinityPfm.java	2014-11-27 22:23:48 +0000
@@ -227,8 +227,8 @@
 			 e.printStackTrace();
 		 } finally {
 			 
-			 try {out.close();} catch (Exception e) {}
-			 try {in.close();} catch (Exception e) {}
+			 try {out.close();} catch (Exception e) {System.err.println(e.getMessage());}
+			 try {in.close();} catch (Exception e) {System.err.println(e.getMessage());}
 			 
 		 }
 

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/core/action/MainAction.java'
--- infinitypfm/src/main/java/org/infinitypfm/core/action/MainAction.java	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/action/MainAction.java	2014-11-27 22:23:48 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2012 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2013 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -34,7 +34,6 @@
 import org.eclipse.swt.widgets.DirectoryDialog;
 import org.eclipse.swt.widgets.FileDialog;
 import org.infinitypfm.client.InfinityPfm;
-import org.infinitypfm.core.conf.LangLoader;
 import org.infinitypfm.core.conf.MM;
 import org.infinitypfm.core.data.Account;
 import org.infinitypfm.core.data.Budget;
@@ -58,6 +57,7 @@
 import org.infinitypfm.ui.view.dialogs.DefaultAccountSelectorDialog;
 import org.infinitypfm.ui.view.dialogs.HelpDialog;
 import org.infinitypfm.ui.view.dialogs.ImportDialog;
+import org.infinitypfm.ui.view.dialogs.ImportRulesDialog;
 import org.infinitypfm.ui.view.dialogs.InfoDialog;
 import org.infinitypfm.ui.view.dialogs.MessageDialog;
 import org.infinitypfm.ui.view.dialogs.NewAccountDialog;
@@ -68,13 +68,10 @@
 import org.infinitypfm.ui.view.views.BaseView;
 import org.infinitypfm.ui.view.views.ReportView;
 
-//import org.apache.commons.io.*;
-
 /**
- * @author WGGRAY
+ * This class contains handlers for the majority of menu item actions.
  * 
- *         To change the template for this generated type comment go to
- *         Window>Preferences>Java>Code Generation>Code and Comments
+ * @author Wayne Gray
  */
 public class MainAction {
 
@@ -84,20 +81,28 @@
 
 	public void ProcessMenuItem(int item) {
 
+		int selectedAccount = -1; 
+				
+		if (InfinityPfm.qzMain.getTrMain().getSelectedAccount() != null) {
+			selectedAccount = InfinityPfm.qzMain.getTrMain().getSelectedAccount().getActId();
+		}
+		
 		switch (item) {
 		case MM.MENU_FILE_EXIT:
 			InfinityPfm.shMain.dispose();
 			break;
 		case MM.MENU_FILE_SAVE:
-
 			break;
 		case MM.MENU_FILE_IMPORT_QFX:
 		case MM.MENU_FILE_IMPORT_OFX:
 		case MM.MENU_FILE_IMPORT_QIF:
-			this.LoadImportDialog(item);
+			this.LoadImportDialog(item, selectedAccount);
+			break;
+		case MM.MENU_FILE_IMPORT_RULES:
+			this.LoadImportRulesDialog();
 			break;
 		case MM.MENU_FILE_IMPORT_BTC:
-			this.BitcoinImport();
+			this.BitcoinImport(selectedAccount);
 			break;
 		case MM.MENU_EDIT_ADD_ACCOUNT:
 			this.LoadNewAccountDialog();
@@ -120,6 +125,9 @@
 		case MM.MENU_TREE_ACT_ADD:
 			this.LoadNewAccountDialog();
 			break;
+		case MM.MENU_TREE_EDIT_ACT:
+			LoadEditAccountDialog();
+			break;
 		case MM.MENU_TREE_ADD_ACT_FROM_TEMP:
 			this.LoadNewAccountSelectorDialog();
 			break;
@@ -256,12 +264,17 @@
 		BaseDialog act = new NewAccountDialog();
 		act.Open();
 	}
-
+	
+	public void LoadEditAccountDialog() {
+		BaseDialog act = new NewAccountDialog();
+		act.Open();
+	}
 	public void LoadNewAccountSelectorDialog() {
 		BaseDialog act = new DefaultAccountSelectorDialog();
 		act.Open();
 	}
 
+	@SuppressWarnings("rawtypes")
 	public void AddToBudget() {
 		AccountSelectorDialog dlg = new AccountSelectorDialog();
 		dlg.Open();
@@ -300,6 +313,7 @@
 
 	}
 
+	@SuppressWarnings("rawtypes")
 	public void RemoveFromBudget() {
 		AccountSelectorDialog dlg = new AccountSelectorDialog();
 		dlg.Open();
@@ -332,7 +346,7 @@
 
 	}
 
-	public void LoadImportDialog(int importType) {
+	public void LoadImportDialog(int importType, int showAccount) {
 
 		FileDialog dlg = new FileDialog(InfinityPfm.shMain);
 		dlg.setText(MM.PHRASES.getPhrase("18"));
@@ -360,7 +374,7 @@
 		try {
 			
 			List<Transaction> trans = fileImport.ImportFile(sFile);
-			ShowImportDialog(trans);
+			ShowImportDialog(trans, showAccount);
 			
 		} catch (FileNotFoundException e) {
 			InfinityPfm.LogMessage(e.getMessage(), true);
@@ -372,18 +386,55 @@
 
 	}
 	
-	public void BitcoinImport(){
+	public void LoadImportRulesDialog(){
+		ImportRulesDialog rulesDialog = new ImportRulesDialog();
+		rulesDialog.Open();
+	}
+	
+	public void BitcoinImport(int showAccount){
 		
 		
 		if (MM.bitcoinUser == null){
-			PasswordDialog pwdDlg = new PasswordDialog();
-			
-			String[] creds = pwdDlg.getCredentials();
-			
-			if (creds.length==2){
-			
-				MM.bitcoinUser = creds[0];
-				MM.bitcoinPwd = creds[1];
+
+			//Check if bitcoin.conf exists
+			FileHandler fileHandler = new FileHandler();
+			
+			try {
+				fileHandler.FileOpenRead(System.getProperty("user.home") + "/.bitcoin/bitcoin.conf");
+				String temp = fileHandler.LineInput();
+				while (temp!=null){
+					
+					if (MM.bitcoinUser!=null && MM.bitcoinPwd != null) break;
+					
+					if (temp.startsWith("rpcuser")){
+						MM.bitcoinUser = temp.split("=")[1].trim();
+					} else if (temp.startsWith("rpcpassword")){
+						MM.bitcoinPwd = temp.split("=")[1].trim();
+					}
+					
+					temp = fileHandler.LineInput();
+				}
+
+				fileHandler.FileClose();
+				
+			} catch (FileNotFoundException e) {
+				InfinityPfm.LogMessage(e.getMessage(), true);
+			} catch (IOException e) {
+				InfinityPfm.LogMessage(e.getMessage(), true);
+			}
+			
+			//Show a dialog if bitcoin.conf was not used
+			if (MM.bitcoinUser==null || MM.bitcoinPwd==null){
+			
+				PasswordDialog pwdDlg = new PasswordDialog();
+				
+				String[] creds = pwdDlg.getCredentials();
+				
+				if (creds.length==2){
+				
+					MM.bitcoinUser = creds[0];
+					MM.bitcoinPwd = creds[1];
+				}
 			}
 		
 			if (MM.bitcoinUser==null || MM.bitcoinUser.length()==0){
@@ -394,13 +445,13 @@
 		
 		BitcoinImport importTest = new BitcoinImport();
 		List<Transaction> trans = importTest.ImportFile("blah");
-		ShowImportDialog(trans);
+		ShowImportDialog(trans, showAccount);
 		
 	}
 	
-	private void ShowImportDialog(List<Transaction> trans){
+	private void ShowImportDialog(List<Transaction> trans, int showAccount){
 		
-		ImportDialog importDialog = new ImportDialog(trans);
+		ImportDialog importDialog = new ImportDialog(trans, showAccount);
 		importDialog.Open();
 		InfinityPfm.qzMain.getVwMain().RefreshCurrentView();
 

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/core/conf/LangLoader.java'
--- infinitypfm/src/main/java/org/infinitypfm/core/conf/LangLoader.java	2012-12-03 03:03:10 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/conf/LangLoader.java	2014-11-27 22:23:48 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2012 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2013 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -20,17 +20,13 @@
 package org.infinitypfm.core.conf;
 
 import java.util.HashMap;
-import java.util.Locale;
 
 import org.xnap.commons.i18n.I18n;
 import org.xnap.commons.i18n.I18nFactory;
 
 
 /**
- * @author wggray
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
+ * @author Wayne Gray
  */
 public class LangLoader {
 
@@ -281,6 +277,17 @@
 		hmPhrases.put("234", i18n.tr("Invalid offset account or amount"));
 		hmPhrases.put("235", i18n.tr("Split"));
 		hmPhrases.put("236", i18n.tr("Delete Row"));
+		hmPhrases.put("237", i18n.tr("Check"));
+		hmPhrases.put("238", i18n.tr("Post All"));
+		hmPhrases.put("239", i18n.tr("pending transactions posted"));
+		hmPhrases.put("240", i18n.tr("Import Rules"));
+		hmPhrases.put("241", i18n.tr("Assign To"));
+		hmPhrases.put("242", i18n.tr("New Rule"));
+		hmPhrases.put("243", i18n.tr("Contains"));
+		hmPhrases.put("244", i18n.tr("Starts With"));
+		hmPhrases.put("245", i18n.tr("Ends With"));
+		hmPhrases.put("246", i18n.tr("Import rule contains an invalid account!"));
+		
 		
 	}
 	

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/core/conf/MM.java'
--- infinitypfm/src/main/java/org/infinitypfm/core/conf/MM.java	2012-12-03 03:03:10 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/conf/MM.java	2014-11-27 22:23:48 +0000
@@ -38,10 +38,10 @@
 	 * Program Constants
 	 */
 	public static final String APPTITLE = "Infinity PFM";
-	public static final String APPVERSION = "0.6.0";
-	public static final String APPLINK = "https://launchpad.net/infinitypfm";
+	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-2012 by Wayne Gray";
+	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 int ROW_BACKGROUND = SWT.COLOR_LIST_BACKGROUND;
 	
@@ -80,6 +80,7 @@
 	
 	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 final int YES = 0;
 	public static final int NO = 1;
@@ -114,6 +115,7 @@
 	public static final int MENU_TREE_ADD_ACT_BUDGET = 25;
 	public static final int MENU_TREE_ADD_ACT_FROM_TEMP = 26;
 	public static final int MENU_TREE_REM_ACT_BUDGET = 27;
+	public static final int MENU_TREE_EDIT_ACT = 28;
 
 	public static final int MENU_FILE_EXIT = 30;
 	public static final int MENU_FILE_SAVE = 31;
@@ -121,8 +123,9 @@
 	public static final int MENU_FILE_IMPORT_QFX = 33;
 	public static final int MENU_FILE_IMPORT_QIF = 34;
 	public static final int MENU_FILE_IMPORT_BTC = 35;
-	public static final int MENU_FILE_BACKUP = 36;
-	public static final int MENU_FILE_RESTORE = 37;
+	public static final int MENU_FILE_IMPORT_RULES = 36;
+	public static final int MENU_FILE_BACKUP = 37;
+	public static final int MENU_FILE_RESTORE = 38;
 	
 	public static final int MENU_REPORT_EXECUTE = 40;
 	public static final int MENU_REPORT_SAVE = 41;

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/core/currency/RateParser.java'
--- infinitypfm/src/main/java/org/infinitypfm/core/currency/RateParser.java	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/currency/RateParser.java	2014-11-27 22:23:48 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2012 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2013 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -15,13 +15,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with Infinity PFM.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ */
 package org.infinitypfm.core.currency;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
-import net.sf.json.JSONException;
 import net.sf.json.JSONObject;
 import net.sf.json.util.JSONTokener;
 
@@ -34,39 +33,40 @@
 	public static String getRate(CurrencyMethod method) {
 
 		BigDecimal rate = null;
-		String page = null;		
+		String page = null;
 		page = PageHandler.getPage(method.getMethodUrl());
-		
-		if (page != null && page.length() > 0){
-		
-			JSONTokener tokener = new JSONTokener(page);
-            Object rawResponseMessage;
+
+		if (page != null && page.length() > 0) {
+
 			try {
-				
+
+				JSONTokener tokener = new JSONTokener(page);
+				Object rawResponseMessage;
 				rawResponseMessage = tokener.nextValue();
 				JSONObject part = (JSONObject) rawResponseMessage;
-				
+
 				String[] parts = method.getMethodPath().split("\\.");
-				
-				for (int i=0; i<parts.length; i++){
-					
+
+				for (int i = 0; i < parts.length; i++) {
+
 					if (!parts[i].equals("$")) {
-						
-						if (i<parts.length-1){
-							part = (JSONObject)part.get(parts[i]);
+
+						if (i < parts.length - 1) {
+							part = (JSONObject) part.get(parts[i]);
 						} else {
 							rate = new BigDecimal(part.getString(parts[i]));
-							rate.setScale(8, RoundingMode.HALF_UP);
+							rate = rate.setScale(8, RoundingMode.HALF_UP);
 						}
-					}					
+					}
 				}
-				
-			} catch (JSONException e) {
+
+			} catch (Exception e) {
 				InfinityPfm.LogMessage(e.getMessage());
+				rate = new BigDecimal("-1");
 			}
-	            
+
 		}
-					
+
 		return rate.toString();
 	}
 

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/core/data/Account.xml'
--- infinitypfm/src/main/java/org/infinitypfm/core/data/Account.xml	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/data/Account.xml	2014-11-27 22:23:48 +0000
@@ -109,6 +109,26 @@
         WHERE ActId = #actId#
    </select>
    
+   <select id="getAccountByActId" parameterClass="act"
+                           resultClass="act">
+     SELECT
+           ActId as actId,
+           ActName as actName,
+           ActTypeId as actTypeId,
+           ActTypeName as actTypeName,
+           ActNumber as actNumber,
+           ActBalance as actBalance,
+          curr.CurrencyID,
+          curr.Name as currencyName,
+          curr.IsoCode as isoCode
+        FROM Accounts
+         INNER JOIN AccountTypes
+	      ON Accounts.ActTypeId = AccountTypes.ActTypeId
+	      INNER JOIN Currencies curr
+			ON Accounts.CurrencyID = curr.CurrencyID
+        WHERE ActId = #actId#
+   </select>
+   
      <select id="getAllAccountsByType" resultClass="act">
         SELECT
            ActId as actId,

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/core/data/DataFormatUtil.java'
--- infinitypfm/src/main/java/org/infinitypfm/core/data/DataFormatUtil.java	2012-12-03 03:03:10 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/data/DataFormatUtil.java	2014-11-27 22:23:48 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2012 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2013 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -15,9 +15,10 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with Infinity PFM.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ */
 package org.infinitypfm.core.data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DateFormat;
@@ -32,31 +33,28 @@
 import org.infinitypfm.core.conf.MM;
 import org.infinitypfm.core.types.NumberFormat;
 
-
 /**
  * @author Wayne Gray
- *
+ * 
  */
-public class DataFormatUtil {
-	
-	String[] monthName = {"January", "February",
-		"March", "April", "May", "June", "July",
-		"August", "September", "October", "November",
-		"December"};
-	
+public class DataFormatUtil implements Serializable {
+
+	private static final long serialVersionUID = 6215132601470795925L;
+
+	String[] monthName = { "January", "February", "March", "April", "May",
+			"June", "July", "August", "September", "October", "November",
+			"December" };
+
 	Date date = null;
 	GregorianCalendar calendar = null;
 	DateFormat dateFmt = new SimpleDateFormat("M-dd-yyyy");
 	DecimalFormat formatter = new DecimalFormat(NumberFormat.getDefault());
 	GregorianCalendar today = null;
 
-	public DataFormatUtil(){
+	public DataFormatUtil() {
 		today = new GregorianCalendar();
 	}
-	
-	/**
-	 * 
-	 */
+
 	public void setDate(Date dt) {
 		date = dt;
 		calendar = new GregorianCalendar();
@@ -64,134 +62,132 @@
 
 	}
 
-   public void setDate(int yr, int month) {
-	   calendar = new GregorianCalendar(yr, month-1, 1);
-       date = calendar.getTime();	
-   }
-   
-   public void setDate(String sDate){
-	   
-	   try {
-		date = dateFmt.parse(sDate);
+	public void setDate(int yr, int month) {
+		calendar = new GregorianCalendar(yr, month - 1, 1);
+		date = calendar.getTime();
+	}
+
+	public void setDate(String sDate) {
+
+		try {
+			date = dateFmt.parse(sDate);
 		} catch (ParseException e) {
 			InfinityPfm.LogMessage(e.getMessage());
 		}
-	   
-	   calendar = new GregorianCalendar();
-	   if (date!=null){
-		   calendar.setTime(date);
-	   }
-	   
-   }
-   
-   public Date getDate() {
-	return calendar.getTime();	
-   }
-	
-	public int getMonth(){
+
+		calendar = new GregorianCalendar();
+		if (date != null) {
+			calendar.setTime(date);
+		}
+
+	}
+
+	public Date getDate() {
+		return calendar.getTime();
+	}
+
+	public int getMonth() {
 		return calendar.get(Calendar.MONTH) + 1;
-		
+
 	}
-	
+
 	public String getMonthName(int offset) {
-		return monthName[calendar.get(Calendar.MONTH)+offset];
+		return monthName[calendar.get(Calendar.MONTH) + offset];
 	}
-	
-	public int getYear(){
+
+	public int getYear() {
 		return calendar.get(Calendar.YEAR);
 	}
-	
-	public String getFormat(String format){
+
+	public String getFormat(String format) {
 		dateFmt = new SimpleDateFormat(format);
 		if (date != null)
 			return dateFmt.format(date);
-		else 
+		else
 			return dateFmt.format(this.getToday());
 	}
 
-	public String getAmountFormatted(long amount){
+	public String getAmountFormatted(long amount) {
 		formatter.applyPattern(NumberFormat.getDefault());
-		
-		BigDecimal amtD = strictDivide(Long.toString(amount), 
-				"100000000", MM.options.getCurrencyPrecision());
-		
+
+		BigDecimal amtD = strictDivide(Long.toString(amount), "100000000",
+				MM.options.getCurrencyPrecision());
+
 		return formatter.format(amtD);
-		
+
 	}
 
-	public String getAmountFormatted(long amount, String format){
-			
+	public String getAmountFormatted(long amount, String format) {
+
 		formatter.applyPattern(format);
-		
-		BigDecimal amtD = strictDivide(Long.toString(amount), 
-				"100000000", MM.options.getCurrencyPrecision());
-		
+
+		BigDecimal amtD = strictDivide(Long.toString(amount), "100000000",
+				MM.options.getCurrencyPrecision());
+
 		return formatter.format(amtD);
 	}
-	
-	public double roundDouble(double val, String format){
+
+	public double roundDouble(double val, String format) {
 		DecimalFormat twoDForm = new DecimalFormat(format);
 		return Double.valueOf(twoDForm.format(val));
 	}
-	
+
 	public Date setNext(String frequency) {
-		
-		if (frequency.equals(MM.PHRASES.getPhrase(MM.RECUR_BIWEEKLY))){
+
+		if (frequency.equals(MM.PHRASES.getPhrase(MM.RECUR_BIWEEKLY))) {
 			calendar.add(Calendar.WEEK_OF_YEAR, 2);
-		} else if (frequency.equals(MM.PHRASES.getPhrase(MM.RECUR_MONTHLY))){
+		} else if (frequency.equals(MM.PHRASES.getPhrase(MM.RECUR_MONTHLY))) {
 			calendar.add(Calendar.MONTH, 1);
-		} else if (frequency.equals(MM.PHRASES.getPhrase(MM.RECUR_WEEKLY))){
+		} else if (frequency.equals(MM.PHRASES.getPhrase(MM.RECUR_WEEKLY))) {
 			calendar.add(Calendar.WEEK_OF_YEAR, 1);
-		} else if (frequency.equals(MM.PHRASES.getPhrase(MM.RECUR_YEARLY))){
+		} else if (frequency.equals(MM.PHRASES.getPhrase(MM.RECUR_YEARLY))) {
 			calendar.add(Calendar.YEAR, 1);
 		}
-		
+
 		return calendar.getTime();
 	}
 
 	public Date getToday() {
 		return today.getTime();
 	}
-	
-	public static long moneyToLong(String val){
-		
-		
-		if (val.startsWith("(")){
-			
-			val = val.replaceAll("\\(", "\\-").replaceAll("\\)","");
+
+	public static long moneyToLong(String val) {
+
+		if (val.startsWith("(")) {
+
+			val = val.replaceAll("\\(", "\\-").replaceAll("\\)", "");
 		}
-			
+
 		BigDecimal newVal = new BigDecimal(val);
-		
+
 		return moneyToLong(newVal);
-		
+
 	}
-	
-	public static long moneyToLong(BigDecimal val){
-		
+
+	public static long moneyToLong(BigDecimal val) {
+
 		return val.multiply(new BigDecimal("100000000")).longValue();
-		
+
 	}
-	
-	public BigDecimal strictDivide(String numerator, String denominator, int scale){
-		
+
+	public BigDecimal strictDivide(String numerator, String denominator,
+			int scale) {
+
 		BigDecimal num = new BigDecimal(numerator);
 		BigDecimal den = new BigDecimal(denominator);
 		BigDecimal result = num.divide(den, scale, RoundingMode.HALF_UP);
-		
+
 		return result;
-		
-		
+
 	}
-	
-	public BigDecimal strictMultiply(String x, String y){
-		
+
+	public BigDecimal strictMultiply(String x, String y) {
+
 		BigDecimal valX = new BigDecimal(x);
 		BigDecimal valY = new BigDecimal(y);
 		BigDecimal result = valX.multiply(valY);
-		
+
 		return result;
-		
-		
+
 	}
 }

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/core/data/Database.java'
--- infinitypfm/src/main/java/org/infinitypfm/core/data/Database.java	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/data/Database.java	2014-11-27 22:23:48 +0000
@@ -48,14 +48,16 @@
 				"createPKRecurHeader", "createPKRecurDetail",
 				"createFK2RecurDetail", "createPKAccountTypes",
 				"createPKAccounts", "createPKAccountTemplates",
-				"createPKImportHistory", "createFKTransactions",
+				"createPKImportHistory", "createTableImportRules",
+				"createFKTransactions",
 				"createFKAccounts", "createPKMonthlyBalance", "createPKBudget",
 				"createPKBudgetDetail", "createFKBudgetDetail",
 				"createFK2BudgetDetail", "createFKMonthlyBalance",
 				"createTableCurrencies", "createPKCurrencies",
 				"createTableCurrencyMethods", "createPKCurrencyMethods",
 				"createFKCurrencyMethods", "createTableTrades", "createPKTrades", 
-				"createFKTrades1", "createFKTrades2"
+				"createFKTrades1", "createFKTrades2", "createPKImportRules",
+				"createFKImportRules"
 				};
 
 		
@@ -270,9 +272,9 @@
 			   return tarFile.getPath();
 			    
 		    } finally {
-		    	try {aos.finish();} catch (Exception e){}
-		    	try {aos.close();} catch (Exception e){}
-		    	try {out.close();} catch (Exception e){}
+		    	try {aos.finish();} catch (Exception e){System.err.println(e.getMessage());}
+		    	try {aos.close();} catch (Exception e){System.err.println(e.getMessage());}
+		    	try {out.close();} catch (Exception e){System.err.println(e.getMessage());}
 		    }
 		}
 		

=== added file 'infinitypfm/src/main/java/org/infinitypfm/core/data/ImportRule.java'
--- infinitypfm/src/main/java/org/infinitypfm/core/data/ImportRule.java	1970-01-01 00:00:00 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/data/ImportRule.java	2014-11-27 22:23:48 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2005-2013 Wayne Gray All rights reserved
+ * 
+ * This file is part of Infinity PFM.
+ * 
+ * Infinity PFM 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 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Infinity PFM 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 Infinity PFM.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.infinitypfm.core.data;
+
+import java.io.Serializable;
+
+import org.infinitypfm.core.types.ImportRuleNames;
+
+public class ImportRule  implements Serializable {
+
+	private static final long serialVersionUID = -3578852899322050549L;
+
+	private int actId;
+	private String keyword=null;
+	private String ruleName=ImportRuleNames.CONTAINS;
+	private String actName = null;
+	public int getActId() {
+		return actId;
+	}
+	public void setActId(int actId) {
+		this.actId = actId;
+	}
+	public String getKeyword() {
+		return keyword;
+	}
+	public void setKeyword(String keyword) {
+		this.keyword = keyword;
+	}
+	public String getRuleName() {
+		return ruleName;
+	}
+	public void setRuleName(String ruleName) {
+		this.ruleName = ruleName;
+	}
+	public String getActName() {
+		return actName;
+	}
+	public void setActName(String actName) {
+		this.actName = actName;
+	}
+	
+	
+	
+}

=== added file 'infinitypfm/src/main/java/org/infinitypfm/core/data/ImportRules.xml'
--- infinitypfm/src/main/java/org/infinitypfm/core/data/ImportRules.xml	1970-01-01 00:00:00 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/data/ImportRules.xml	2014-11-27 22:23:48 +0000
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Copyright (c) 2005-2013 Wayne Gray All rights reserved This file is 
+	part of Infinity PFM. Infinity PFM 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 3 of the License, 
+	or (at your option) any later version. Infinity PFM 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 Infinity PFM. If not, see <http://www.gnu.org/licenses/>. -->
+
+
+<!DOCTYPE sqlMap PUBLIC
+  "-//iBATIS.com//DTD SQL Map 2.0//EN"
+  "http://www.ibatis.com/dtd/sql-map-2.dtd">
+<sqlMap namespace="ImportRules">
+
+	<typeAlias alias="importRule" type="org.infinitypfm.core.data.ImportRule" />
+
+	<insert id="insertImportRule" parameterClass="importRule">
+
+		INSERT INTO ImportRules
+		(
+		ActID,
+		Keyword,
+		RuleName
+		)
+		VALUES
+		(
+		#actId#,
+		#keyword#,
+		#ruleName#
+		)
+
+	</insert>
+
+	<select id="getImportRules"  
+		resultClass="importRule">
+
+		 SELECT
+           ActId as actId,
+           Keyword as keyword,
+           RuleName as ruleName,
+           ActName as actName
+        FROM ImportRules
+        	INNER JOIN Accounts
+        		ON ImportRules.ActId = Accounts.ActId
+
+	</select>
+
+	<select id="getImportRule"
+		parameterClass="importRule"  
+		resultClass="importRule">
+
+		 SELECT
+           ActId as actId,
+           Keyword as keyword,
+           RuleName as ruleName
+        FROM ImportRules
+        WHERE ActId = #actId#
+        	AND Keyword = #keyword#
+
+	</select>
+	
+	<delete id="deleteImportrule"
+		parameterClass="importRule">
+	
+		DELETE FROM ImportRules
+		WHERE ActId = #actId#
+			AND Keyword = #keyword#	
+		
+	</delete>
+
+</sqlMap>
\ No newline at end of file

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/core/data/InfinityUpdates.java'
--- infinitypfm/src/main/java/org/infinitypfm/core/data/InfinityUpdates.java	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/data/InfinityUpdates.java	2014-11-27 22:23:48 +0000
@@ -57,6 +57,7 @@
 			ApplyVersion040();
 			ApplyVersion050();
 			ApplyVersion060();
+			ApplyVersion070();
 		} else if (sVersion.equals("0.0.2")) {
 			ApplyVersion010();
 			ApplyVersion030();
@@ -64,38 +65,48 @@
 			ApplyVersion040();
 			ApplyVersion050();
 			ApplyVersion060();
+			ApplyVersion070();
 		} else if (sVersion.equals("0.1.0")) {
 			ApplyVersion030();
 			ApplyVersion035();
 			ApplyVersion040();
 			ApplyVersion050();
 			ApplyVersion060();
+			ApplyVersion070();
 		} else if (sVersion.equals("0.2.0")) {
 			ApplyVersion030();
 			ApplyVersion035();
 			ApplyVersion040();
 			ApplyVersion050();
 			ApplyVersion060();
+			ApplyVersion070();
 		} else if (sVersion.equals("0.2.1")) {
 			ApplyVersion030();
 			ApplyVersion035();
 			ApplyVersion040();
 			ApplyVersion050();
 			ApplyVersion060();
+			ApplyVersion070();
 		} else if (sVersion.equals("0.3.0")) {
 			ApplyVersion035();
 			ApplyVersion040();
 			ApplyVersion050();
 			ApplyVersion060();
+			ApplyVersion070();
 		} else if (sVersion.equals("0.3.5")) {
 			ApplyVersion040();
 			ApplyVersion050();
 			ApplyVersion060();
+			ApplyVersion070();
 		} else if (sVersion.equals("0.4.0")) {
 			ApplyVersion050();
 			ApplyVersion060();
+			ApplyVersion070();
 		} else if (sVersion.equals("0.5.0")) {
 			ApplyVersion060();
+			ApplyVersion070();
+		} else if (sVersion.equalsIgnoreCase("0.6.0")){
+			ApplyVersion070();
 		}
 
 	}
@@ -207,5 +218,12 @@
 		
 		MM.sqlMap.update("bumpVersion", "0.6.0");
 	}
+	
+	private void ApplyVersion070() throws SQLException {
+		MM.sqlMap.insert("createTableImportRules");
+		MM.sqlMap.insert("createPKImportRules");
+		MM.sqlMap.insert("createFKImportRules");
+		MM.sqlMap.update("bumpVersion", "0.7.0");
+	}
 
 }

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/core/data/Manage.xml'
--- infinitypfm/src/main/java/org/infinitypfm/core/data/Manage.xml	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/data/Manage.xml	2014-11-27 22:23:48 +0000
@@ -113,6 +113,15 @@
 		)
   </statement>
 
+	<statement id="createTableImportRules">
+		CREATE CACHED TABLE ImportRules
+		(
+		ActID INT,
+		Keyword VARCHAR(100),
+		RuleName VARCHAR(25)
+		)
+  </statement>
+
 	<statement id="createTableRecurHeader">
 		CREATE CACHED TABLE RecurHeader
 		(
@@ -216,6 +225,12 @@
 		UNIQUE(ActID, Memo)
   	 </statement>
 
+	<statement id="createPKImportRules">
+		ALTER TABLE ImportRules ADD
+		CONSTRAINT ImportRules_PK
+		UNIQUE (ActID, Keyword, RuleName)
+	</statement>
+
 	<statement id="createPKCurrencies">
 		ALTER TABLE Currencies ADD
 		CONSTRAINT Currencies_IsoCode
@@ -329,6 +344,12 @@
 		FOREIGN KEY (CurrencyID) REFERENCES Currencies (CurrencyID);
   	</statement>
 
+	<statement id="createFKImportRules">
+		ALTER TABLE ImportRules ADD
+		CONSTRAINT FK_ImportRules_Account
+		FOREIGN KEY (ActID) REFERENCES Accounts (ActID)
+	 </statement>
+
 	<insert id="addAppSetting" parameterClass="java.lang.String">
 		INSERT INTO
 		AppSettings (AppVersion) VALUES (#value#)

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/core/data/ReportData.java'
--- infinitypfm/src/main/java/org/infinitypfm/core/data/ReportData.java	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/data/ReportData.java	2014-11-27 22:23:48 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2012 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2013 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -15,7 +15,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with Infinity PFM.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ */
 package org.infinitypfm.core.data;
 
 import java.sql.SQLException;
@@ -31,6 +31,7 @@
 public class ReportData {
 
 	private DataFormatUtil dateUtil;
+	@SuppressWarnings("rawtypes")
 	private List reportData;
 	private String incomeTotal;
 	private String expenseTotal;
@@ -39,59 +40,56 @@
 	private String budget;
 	private String account;
 	private Boolean userCancelled = false;
-	
-	public ReportData(int reportType){
-		
+
+	public ReportData(int reportType) {
+
 		dateUtil = new DataFormatUtil();
 		ParamDateRange reportParam = new ParamDateRange();
-		
-		switch (reportType){
-		
+
+		switch (reportType) {
+
 		case MM.THIS_MONTH:
-			
+
 			dateUtil.setDate(new Date());
 			initTotals();
 			title = MM.PHRASES.getPhrase("123") + " "
-			+ dateUtil.getMonthName(0) + " " 
-			+ dateUtil.getYear();
+					+ dateUtil.getMonthName(0) + " " + dateUtil.getYear();
 			reportParam.setMth(dateUtil.getMonth());
 			reportParam.setYr(dateUtil.getYear());
 			setReportData("getReportMonthlyBalances", reportParam);
-			
-			
+
 			break;
 		case MM.LAST_MONTH:
-			
+
 			promptForMonthYr();
 			initTotals();
 			title = MM.PHRASES.getPhrase("123") + " "
-			+ dateUtil.getMonthName(0) + " " 
-			+ dateUtil.getYear();
+					+ dateUtil.getMonthName(0) + " " + dateUtil.getYear();
 			reportParam.setMth(dateUtil.getMonth());
 			reportParam.setYr(dateUtil.getYear());
 			setReportData("getReportMonthlyBalances", reportParam);
-			
+
 			break;
 		case MM.MENU_REPORTS_ACCOUNT_HISTORY:
-			
+
 			dateUtil.setDate(new Date());
 			title = MM.PHRASES.getPhrase("136");
 			MonthlyBalance monthlyBalance = new MonthlyBalance();
-			
-			account = promptForAccount();
+
+			account = promptForAccount(true); //Include income accounts
 
 			if (account != null) {
 
 				monthlyBalance.setActName(account);
 				monthlyBalance.setMth(dateUtil.getMonth());
-				monthlyBalance.setYr(dateUtil.getYear()-1);
+				monthlyBalance.setYr(dateUtil.getYear() - 1);
 				setReportData("getReportAccountHistory", monthlyBalance);
-				
+
 			}
-			
+
 			break;
 		case MM.MENU_REPORTS_BUDGET_PERFORMANCE:
-			
+
 			dateUtil.setDate(new Date());
 			title = MM.PHRASES.getPhrase("164");
 
@@ -107,10 +105,10 @@
 				setReportData("getBudgetVsExpenseByMonth", args);
 
 			}
-			
+
 			break;
 		case MM.MENU_REPORTS_BUDGET_PERFORMANCE_ACT:
-			
+
 			dateUtil.setDate(new Date());
 
 			account = promptForAccount();
@@ -119,7 +117,7 @@
 			if (budget != null && account != null) {
 
 				title = MM.PHRASES.getPhrase("164") + ":  " + account;
-				
+
 				BudgetBalance args = new BudgetBalance();
 				args.setActName(account);
 				args.setBudgetName(budget);
@@ -129,38 +127,42 @@
 				setReportData("getBudgetVsExpenseByMonthAndAccount", args);
 
 			}
-			
+
 			break;
 		case MM.MENU_REPORTS_INCOME_VS_EXPENSE:
-			
+
 			dateUtil.setDate(new Date());
 			title = MM.PHRASES.getPhrase("221");
 			reportParam.setMth(dateUtil.getMonth());
 			reportParam.setYr(dateUtil.getYear());
 			setReportData("getIncomeVsExpense", reportParam);
-			
+
 			break;
-	
-	
+
 		}
 	}
 
+	@SuppressWarnings("rawtypes")
 	public List getReportData() {
 		return reportData;
 	}
+
 	public String getIncomeTotal() {
 		return incomeTotal;
-	}	
+	}
+
 	public String getExpenseTotal() {
 		return expenseTotal;
 	}
+
 	public String getLiabilityTotal() {
 		return liabilityTotal;
 	}
-		public String getTitle() {
+
+	public String getTitle() {
 		return title;
 	}
-		
+
 	public Boolean getUserCanceled() {
 		return userCancelled;
 	}
@@ -170,65 +172,70 @@
 	}
 
 	private void initTotals() {
-		
+
 		BudgetDetail budgetDetail = new BudgetDetail();
 		budgetDetail.setMth(dateUtil.getMonth());
 		budgetDetail.setYr(dateUtil.getYear());
-		
+
 		try {
-			
+
 			incomeTotal = (String) MM.sqlMap.queryForObject(
 					"getIncomeTotalForMonth", budgetDetail);
 			expenseTotal = (String) MM.sqlMap.queryForObject(
 					"getExpenseTotalForMonth", budgetDetail);
 			liabilityTotal = (String) MM.sqlMap.queryForObject(
 					"getLiabilityTotalForMonth", budgetDetail);
-			
+
 		} catch (SQLException e) {
 			InfinityPfm.LogMessage(e.getMessage());
 		}
-		
+
 	}
-	
-	private void promptForMonthYr(){
-		
+
+	private void promptForMonthYr() {
+
 		MonthYearDialog monthPicker = new MonthYearDialog();
 		monthPicker.Open();
-		
+
 		dateUtil.setDate(monthPicker.getYear(), monthPicker.getMonth());
 		userCancelled = monthPicker.userCancelled();
-		
+
 	}
-	
-	private void setReportData (String reportName, Object args){
-		
+
+	private void setReportData(String reportName, Object args) {
+
 		try {
-			
-			reportData = MM.sqlMap.queryForList(reportName,args);
-			
+
+			reportData = MM.sqlMap.queryForList(reportName, args);
+
 		} catch (SQLException e) {
 			InfinityPfm.LogMessage(e.getMessage());
 		}
-		
+
 	}
-	
-	private String promptForBudget(){
-		
+
+	private String promptForBudget() {
+
 		BudgetSelector budgetDialog = new BudgetSelector();
 		budgetDialog.Open();
 		userCancelled = budgetDialog.userCancelled();
-		
+
 		return budgetDialog.getBudgetName();
 	}
-	
-	private String promptForAccount(){
-	
+
+	private String promptForAccount() {
+		return promptForAccount(false);
+	}
+	
+	private String promptForAccount(boolean inludeIncome) {
+
 		AccountSelectorDialog acctSelect = new AccountSelectorDialog();
+		acctSelect.setIncludeIncomeAccounts(inludeIncome);
 		acctSelect.Open();
 		userCancelled = acctSelect.userCancelled();
-	
+
 		return acctSelect.getAccountName();
-	
+
 	}
-	
+
 }

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/core/data/Reports.xml'
--- infinitypfm/src/main/java/org/infinitypfm/core/data/Reports.xml	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/data/Reports.xml	2014-11-27 22:23:48 +0000
@@ -33,7 +33,7 @@
   
    <select id="getReportMonthlyBalances" resultClass="monthBalance" parameterClass="dateParams">
       <![CDATA[
-       SELECT at.ACTTYPENAME,
+       SELECT az.ACTTYPENAME,
    	a.ACTNAME,
    	mb.YR,
    	mb.MTH,
@@ -42,12 +42,12 @@
 	FROM MONTHLYBALANCE mb
   		INNER JOIN ACCOUNTS a
    			ON mb.ACTID = a.ACTID
-   		INNER JOIN ACCOUNTTYPES at
-     		ON a.ACTTYPEID = at.ACTTYPEID
+   		INNER JOIN ACCOUNTTYPES az
+     		ON a.ACTTYPEID = az.ACTTYPEID
      	INNER JOIN CURRENCIES c
      		ON a.CURRENCYID = c.CURRENCYID
 	WHERE mb.YR = #yr# AND mb.MTH = #mth#
-	ORDER BY at.ACTTYPEID, a.ACTNAME;
+	ORDER BY az.ACTTYPEID, a.ACTNAME;
        ]]>
   </select>
   <select id="getReportAccountHistory" resultClass="monthBalance" parameterClass="monthBalance">
@@ -80,8 +80,8 @@
 		FROM MONTHLYBALANCE mb
 			INNER JOIN ACCOUNTS a
 			ON mb.ACTID = a.ACTID
-		INNER JOIN ACCOUNTTYPES at
-			ON a.ACTTYPEID = at.ACTTYPEID
+		INNER JOIN ACCOUNTTYPES az
+			ON a.ACTTYPEID = az.ACTTYPEID
 		INNER JOIN BUDGETDETAIL bd
 			ON mb.ACTID = bd.ACTID
 			AND mb.MTH = bd.MTH
@@ -117,8 +117,8 @@
 		FROM MONTHLYBALANCE mb
 			INNER JOIN ACCOUNTS a
 			ON mb.ACTID = a.ACTID
-		INNER JOIN ACCOUNTTYPES at
-			ON a.ACTTYPEID = at.ACTTYPEID
+		INNER JOIN ACCOUNTTYPES az
+			ON a.ACTTYPEID = az.ACTTYPEID
 		INNER JOIN BUDGETDETAIL bd
 			ON mb.ACTID = bd.ACTID
 			AND mb.MTH = bd.MTH
@@ -151,14 +151,14 @@
        SELECT 
    			mb.YR,
    			mb.MTH,
-   			SUM(CASE WHEN at.ACTTYPENAME = 'Expense' THEN  mb.ACTBALANCE ELSE 0 END) AS ExpenseBalance,
-   			SUM(CASE WHEN at.ACTTYPENAME = 'Liability' THEN  mb.ACTBALANCE ELSE 0 END) AS LiabilityBalance,
-   			SUM(CASE WHEN at.ACTTYPENAME = 'Income' THEN  mb.ACTBALANCE ELSE 0 END) AS IncomeBalance
+   			SUM(CASE WHEN az.ACTTYPENAME = 'Expense' THEN  mb.ACTBALANCE ELSE 0 END) AS ExpenseBalance,
+   			SUM(CASE WHEN az.ACTTYPENAME = 'Liability' THEN  mb.ACTBALANCE ELSE 0 END) AS LiabilityBalance,
+   			SUM(CASE WHEN az.ACTTYPENAME = 'Income' THEN  mb.ACTBALANCE ELSE 0 END) AS IncomeBalance
 			FROM MONTHLYBALANCE mb
 		  		INNER JOIN ACCOUNTS a
 		   			ON mb.ACTID = a.ACTID
-		   		INNER JOIN ACCOUNTTYPES at
-		     		ON a.ACTTYPEID = at.ACTTYPEID
+		   		INNER JOIN ACCOUNTTYPES az
+		     		ON a.ACTTYPEID = az.ACTTYPEID
 		     	INNER JOIN CURRENCIES c
 		     		ON a.CURRENCYID = c.CURRENCYID
 			WHERE mb.YR >= #yr#-1

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/core/data/SqlMapConfig.xml'
--- infinitypfm/src/main/java/org/infinitypfm/core/data/SqlMapConfig.xml	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/data/SqlMapConfig.xml	2014-11-27 22:23:48 +0000
@@ -66,5 +66,6 @@
   <sqlMap resource="org/infinitypfm/core/data/Manage.xml" />
   <sqlMap resource="org/infinitypfm/core/data/Options.xml" />
   <sqlMap resource="org/infinitypfm/core/data/Currency.xml" />
+  <sqlMap resource="org/infinitypfm/core/data/ImportRules.xml" />
 
 </sqlMapConfig>

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/core/data/SqlMapConfigSvr.xml'
--- infinitypfm/src/main/java/org/infinitypfm/core/data/SqlMapConfigSvr.xml	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/data/SqlMapConfigSvr.xml	2014-11-27 22:23:48 +0000
@@ -67,4 +67,5 @@
   <sqlMap resource="org/infinitypfm/core/data/Manage.xml" />
   <sqlMap resource="org/infinitypfm/core/data/Options.xml" />
   <sqlMap resource="org/infinitypfm/core/data/Currency.xml" />
+  <sqlMap resource="org/infinitypfm/core/data/ImportRules.xml" />
 </sqlMapConfig>

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/core/data/Transaction.java'
--- infinitypfm/src/main/java/org/infinitypfm/core/data/Transaction.java	2012-12-04 03:13:53 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/data/Transaction.java	2014-11-27 22:23:48 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2012 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2013 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -26,15 +26,8 @@
 
 import org.infinitypfm.core.types.DefaultDateFormat;
 
-/**
- * @author wayne
- * 
- *         TODO To change the template for this generated type comment go to
- *         Window - Preferences - Java - Code Style - Code Templates
- */
 public class Transaction implements Serializable {
 
-	
 	private static final long serialVersionUID = -3989677930922526215L;
 	private long tranId;
 	private int actId;
@@ -50,6 +43,7 @@
 	private long recurTranId;
 	private String transactionKey = null;
 	private String exchangeRate = "1";
+	private long actBalance = 0;
 
 	/**
 	 * 
@@ -89,12 +83,12 @@
 	}
 
 	public void setTranAmount(BigDecimal amt) {
-		//assume cents
+		// assume cents
 		BigDecimal multiplier = new BigDecimal("100000000");
-		amt.multiply(multiplier);
-		this.tranAmount = amt.longValue();
+		BigDecimal result = amt.multiply(multiplier);
+		this.tranAmount = result.longValue();
 	}
-	
+
 	/**
 	 * @return Returns the tranDate.
 	 */
@@ -226,26 +220,26 @@
 	 * Still support single offset interface for now.
 	 * ****************************************************
 	 */
-	
+
 	public int getActOffset() {
 		initializeOffset();
 		TransactionOffset offset = offsets.get(0);
 		return offset.getOffsetId();
 	}
-			
+
 	public void setActOffset(int actOffset) {
 		initializeOffset();
 		TransactionOffset offset = offsets.get(0);
 		offset.setOffsetId(actOffset);
 		offset.setOffsetAmount(-this.getTranAmount());
 	}
-	
+
 	public String getActOffsetName() {
 		initializeOffset();
 		TransactionOffset offset = offsets.get(0);
 		return offset.getOffsetName();
 	}
-	
+
 	public void setActOffsetName(String actOffsetName) {
 		initializeOffset();
 		TransactionOffset offset = offsets.get(0);
@@ -253,26 +247,36 @@
 		offset.setOffsetAmount(-this.getTranAmount());
 	}
 
+	public long getActBalance() {
+		return actBalance;
+	}
+
+	public void setActBalance(long actBalance) {
+		this.actBalance = actBalance;
+	}
+
 	/*
 	 * ****************************************************
 	 */
-	
+
+	@SuppressWarnings("rawtypes")
 	public ArrayList getOffsets() {
 		return offsets;
 	}
 
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public void setOffsets(ArrayList offsets) {
 		this.offsets = offsets;
 	}
-	
-	private void initializeOffset(){
-		
-		if (offsets==null){
+
+	private void initializeOffset() {
+
+		if (offsets == null) {
 			offsets = new ArrayList<TransactionOffset>();
 			TransactionOffset newOffset = new TransactionOffset();
 			offsets.add(newOffset);
 		}
-		
+
 	}
-	
+
 }

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/core/data/Transaction.xml'
--- infinitypfm/src/main/java/org/infinitypfm/core/data/Transaction.xml	2012-12-02 04:37:54 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/data/Transaction.xml	2014-11-27 22:23:48 +0000
@@ -233,7 +233,7 @@
    		a.ActName,
    		rh.OffsetID as ActOffset,
    		aOff.ActName as ActOffsetName,
-   		at.ActTypeName,
+   		az.ActTypeName,
    		rd.TranDate,
    		rh.Memo as TranMemo,
    		rh.Amount as TranAmount
@@ -244,8 +244,8 @@
 		 	ON rh.ActId = a.ActId
 		INNER JOIN Accounts aOff
 			ON rh.OffsetId = aOff.ActId
-		INNER JOIN AccountTypes at
-			ON a.ActTypeId = at.ActTypeId 
+		INNER JOIN AccountTypes az
+			ON a.ActTypeId = az.ActTypeId 
    </select>
    
    <insert id="insertRecurringTransaction" parameterClass="org.infinitypfm.core.data.RecurHeader">

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/core/data/Updates.xml'
--- infinitypfm/src/main/java/org/infinitypfm/core/data/Updates.xml	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/data/Updates.xml	2014-11-27 22:23:48 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
 
-Copyright (c) 2005-2012 Wayne Gray All rights reserved
+Copyright (c) 2005-2013 Wayne Gray All rights reserved
   
  This file is part of Infinity PFM.
   
@@ -195,4 +195,5 @@
    <statement id="v0_6_0_k">
    		ALTER TABLE CURRENCYMETHODS ADD COLUMN MethodPath VARCHAR(500);
    </statement>
+   
 </sqlMap>

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/core/data/imports/BaseImport.java'
--- infinitypfm/src/main/java/org/infinitypfm/core/data/imports/BaseImport.java	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/data/imports/BaseImport.java	2014-11-27 22:23:48 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2011 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2013 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -29,32 +29,23 @@
 
 
 /**
- * @author wayne
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
+ * @author Wayne Gray
  */
 public abstract class BaseImport {
 
-	//private List actList = null;
-
-	/**
-	 * 
-	 */
+	public static final String FLD_CHECKNUM = "CHECKNUM";
+	public static final String FLD_DTPOSTED = "DTPOSTED";
+	public static final String FLD_NAME = "NAME";
+	public static final String FLD_MEMO = "MEMO";
+	public static final String FLD_STMTTRN = "STMTTRN";
+	public static final String FLD_TRNAMT = "TRNAMT";
+	
 	public BaseImport() {
 		super();
-		// TODO Auto-generated constructor stub
 	}
 	
 	public abstract List<Transaction> ImportFile(String sFile) throws FileNotFoundException, IOException, ParseException;
 	
-//    protected void OpenImportDialog(List aList){
-//
-//    	actList = aList;
-//    	ImportDialog dlg = new ImportDialog(actList);
-//    	dlg.Open();
-//  
-//    }
    }
     
     

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/core/data/imports/BitcoinImport.java'
--- infinitypfm/src/main/java/org/infinitypfm/core/data/imports/BitcoinImport.java	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/data/imports/BitcoinImport.java	2014-11-27 22:23:48 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2012 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2013 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -32,70 +32,75 @@
 
 public class BitcoinImport extends BaseImport {
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public List<Transaction> ImportFile(String sFile) {
-		
+
 		List<Transaction> result = null;
-		
+
 		try {
-		
-			BitcoinClient client = new BitcoinClient("localhost", MM.bitcoinUser, MM.bitcoinPwd);
+
+			BitcoinClient client = new BitcoinClient("localhost",
+					MM.bitcoinUser, MM.bitcoinPwd);
 			AccountInfo accountInfo = null;
 			TransactionInfo tran = null;
 			Transaction t = null;
 			result = new ArrayList<Transaction>();
-			List<AccountInfo> activeAccounts = client.listReceivedByAccount(0, false);
-			
+			List<AccountInfo> activeAccounts = client.listReceivedByAccount(0,
+					false);
+
 			List<Transaction> transInSystem = null;
-			
-			//Add the default account to the list so we get coins sent
+
+			// Add the default account to the list so we get coins sent
 			AccountInfo defaultAccount = new AccountInfo();
 			defaultAccount.setAccount("");
 			activeAccounts.add(defaultAccount);
-			
-			if (activeAccounts != null){
-			
-				for (int i=0; i<activeAccounts.size(); i++){
-				
+
+			if (activeAccounts != null) {
+
+				for (int i = 0; i < activeAccounts.size(); i++) {
+
 					accountInfo = activeAccounts.get(i);
-					
-					List<TransactionInfo> trans = client.listTransactions(accountInfo.getAccount(), 500);
-					
-					if (trans != null){
-						
-						for (int j=0; j<trans.size(); j++){
-							
+
+					List<TransactionInfo> trans = client.listTransactions(
+							accountInfo.getAccount(), 500);
+
+					if (trans != null) {
+
+						for (int j = 0; j < trans.size(); j++) {
+
 							tran = trans.get(j);
-							
+
 							try {
-								transInSystem = MM.sqlMap.queryForList("getTransactionsByKey", tran.getTxId());
-								
-								if (transInSystem == null || transInSystem.size()==0){
-	
+								transInSystem = MM.sqlMap.queryForList(
+										"getTransactionsByKey", tran.getTxId());
+
+								if (transInSystem == null
+										|| transInSystem.size() == 0) {
+
 									t = new Transaction();
 									t.setTransactionKey(tran.getTxId());
 									t.setTranAmount(tran.getAmount());
 									t.setTranMemo(tran.getCategory());
-									t.setTranDate(new Date(tran.getTime() * 1000));
+									t.setTranDate(new Date(
+											tran.getTime() * 1000));
 									result.add(t);
-									
+
 								}
-								
-								
+
 							} catch (SQLException e) {
 								e.printStackTrace();
 							}
-								
-							
+
 						}
-						
+
 					}
 				}
 			}
-		} catch (Exception e){
+		} catch (Exception e) {
 			e.printStackTrace();
 		}
-	
+
 		return result;
 	}
 

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/core/data/imports/OfxImport.java'
--- infinitypfm/src/main/java/org/infinitypfm/core/data/imports/OfxImport.java	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/data/imports/OfxImport.java	2014-11-27 22:23:48 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2011 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2013 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -30,47 +30,30 @@
 import java.util.Date;
 import java.util.List;
 
-
 import org.apache.commons.io.IOUtils;
+import org.infinitypfm.core.conf.MM;
 import org.infinitypfm.core.data.DataFormatUtil;
 import org.infinitypfm.core.data.Transaction;
 
 /**
  * @author wayne
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class OfxImport extends BaseImport {
-
-	
-	
-	/**
-	 * 
-	 */
+	
 	public OfxImport() {
 		super();
-		// TODO Auto-generated constructor stub
 	}
 
-	/* (non-Javadoc)
-	 * @see net.mogray.mymoney.data.imports.BaseImport#ImportFile(java.lang.String)
-	 */
 	public List<Transaction> ImportFile(String sFile) throws IOException, ParseException 
 	{
 			
-			//boolean startTran = false;
-			//boolean endTran = false;
 			boolean startElement = false;
-			//boolean endElement = false;
 			boolean inTag =  false;
 			
 			String element = "";
 			String val = "";
 			Transaction tran = null;
 			ArrayList<Transaction> tranList = new ArrayList<Transaction>();
-			
-//		try {
 				
 				if (sFile==null){return null;}
 				
@@ -97,7 +80,7 @@
 					} else if (l=='>' && startElement){
 					  startElement = false;
 					  inTag = true;
-					  if (element.equalsIgnoreCase("STMTTRN")){
+					  if (element.equalsIgnoreCase(FLD_STMTTRN)){
 					  	tran = new Transaction();
 					  	tranList.add(tran);
 					  }
@@ -111,32 +94,29 @@
 				}
 				
 				return tranList;
-				
-				
-//		} catch (IOException ioe){
-//			MM.LogMessage(ioe.getMessage());
-//		}
 
 		}
 	
 	private void SaveElement(String element, String val, Transaction tran) throws ParseException{
 	
-		if (element.equalsIgnoreCase("TRNAMT")){
+		if (element.equalsIgnoreCase(FLD_TRNAMT)){
 			
 			tran.setTranAmount(DataFormatUtil.moneyToLong(val));
 			
-		} else if (element.equalsIgnoreCase("MEMO") || element.equalsIgnoreCase("NAME")){
+		} else if (element.equalsIgnoreCase(FLD_MEMO) || element.equalsIgnoreCase(FLD_NAME)){
 			
 			tran.setTranMemo(val);
 			
-		} else if (element.equalsIgnoreCase("DTPOSTED")){
-			//tran.setTranDate(val);
+		} else if (element.equalsIgnoreCase(FLD_DTPOSTED)){
+			
 			DateFormat dateFmt = new SimpleDateFormat("yyyymmddhhmmss");
 			
 				Date dt = dateFmt.parse(val);
 				tran.setTranDate(dt);
 			
 			
+		} else if (element.equalsIgnoreCase(FLD_CHECKNUM)){
+			tran.setTranMemo(MM.PHRASES.getPhrase("237") + " " + val);
 		}
 	}
 

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/core/data/imports/QfxImport.java'
--- infinitypfm/src/main/java/org/infinitypfm/core/data/imports/QfxImport.java	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/data/imports/QfxImport.java	2014-11-27 22:23:48 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2012 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2013 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -30,32 +30,20 @@
 import java.util.Date;
 import java.util.List;
 
-
 import org.apache.commons.io.IOUtils;
+import org.infinitypfm.core.conf.MM;
 import org.infinitypfm.core.data.DataFormatUtil;
 import org.infinitypfm.core.data.Transaction;
 
 /**
  * @author wayne
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class QfxImport extends BaseImport {
-
-	
-	
-	/**
-	 * 
-	 */
+		
 	public QfxImport() {
 		super();
-		// TODO Auto-generated constructor stub
 	}
-
-	/* (non-Javadoc)
-	 * @see net.mogray.mymoney.data.imports.BaseImport#ImportFile(java.lang.String)
-	 */
+	
 	public List<Transaction> ImportFile(String sFile) throws IOException, ParseException {
 		
 		boolean startElement = false;
@@ -91,7 +79,7 @@
 				} else if (l=='>' && startElement){
 				  startElement = false;
 				  inTag = true;
-				  if (element.equalsIgnoreCase("STMTTRN")){
+				  if (element.equalsIgnoreCase(FLD_STMTTRN)){
 				  	tran = new Transaction();
 				    tranList.add(tran);
 				  }
@@ -110,18 +98,20 @@
 	
 	private void SaveElement(String element, String val, Transaction tran) throws ParseException{
 	
-		if (element.equalsIgnoreCase("TRNAMT")){
+		if (element.equalsIgnoreCase(FLD_TRNAMT)){
 			
 			tran.setTranAmount(DataFormatUtil.moneyToLong(val));
 			
-		} else if (element.equalsIgnoreCase("MEMO")){
+		} else if (element.equalsIgnoreCase(FLD_MEMO)){
 			tran.setTranMemo(val);
-		} else if (element.equalsIgnoreCase("NAME")){
+		} else if (element.equalsIgnoreCase(FLD_NAME)){
 				tran.setTranMemo(val);
-		} else if (element.equalsIgnoreCase("DTPOSTED")){
+		} else if (element.equalsIgnoreCase(FLD_DTPOSTED)){
 			DateFormat dateFmt = new SimpleDateFormat("yyyyMMddHHmmss");
 			Date dt = dateFmt.parse(val);
 			tran.setTranDate(dt);
+		} else if (element.equalsIgnoreCase(FLD_CHECKNUM)){
+			tran.setTranMemo(MM.PHRASES.getPhrase("237") + " " + val);
 		}
 	}
 

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/core/reporting/AccountHistory.java'
--- infinitypfm/src/main/java/org/infinitypfm/core/reporting/AccountHistory.java	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/reporting/AccountHistory.java	2014-11-27 22:23:48 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2011 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2013 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -15,7 +15,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with Infinity PFM.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ */
 package org.infinitypfm.core.reporting;
 
 import java.io.File;
@@ -27,14 +27,14 @@
 import org.infinitypfm.core.data.ReportData;
 import org.infinitypfm.core.types.NumberFormat;
 
-
-public class AccountHistory extends BaseReport implements ChartProvider, TableProvider {
+public class AccountHistory extends BaseReport implements ChartProvider,
+		TableProvider {
 
 	private long total = 0;
-	
+
 	public AccountHistory() throws IOException {
 		super();
-		rowColors = new HashMap<String,String>();
+		rowColors = new HashMap<String, String>();
 		rowColors.put("liabilitycolor", "#2e2e2b");
 		rowColors.put("liabilityback", "#f3f6c2");
 		rowColors.put("expensecolor", "#381f1f");
@@ -48,79 +48,79 @@
 	@Override
 	public File execute(ReportData reportData) {
 		try {
-		
+
 			String row = null;
-			
+
 			this.addDocHeader(1, CHART_TYPE_BAR);
-				
+
 			this.addTitle(reportData.getTitle());
-			
+
+			@SuppressWarnings("rawtypes")
 			List rows = reportData.getReportData();
-			
-			if (rows.size()>0) {
+
+			if (rows.size() > 0) {
 				IReportable reportRow = (IReportable) rows.get(0);
 				String[] columns = reportRow.toReportRow().split("\\|");
 				this.startChartData("1", columns[1]);
 			}
-			
-			for (int i=0; i< rows.size(); i++){			
+
+			for (int i = 0; i < rows.size(); i++) {
 				IReportable reportRow = (IReportable) rows.get(i);
-				
+
 				addChartRow(reportRow.toReportRow());
 			}
-			
+
 			this.endChartData("1");
-			
-			
+
 			this.startTableData();
-			
-			for (int i=0; i< rows.size(); i++){
-			
+
+			for (int i = 0; i < rows.size(); i++) {
+
 				IReportable reportRow = (IReportable) rows.get(i);
-				if(i==0){
+				if (i == 0) {
 					addHeaderRow(reportRow.getHeaderRow().split("\\|"));
-				} 		
-				
+				}
+
 				String[] columns = reportRow.toReportRow().split("\\|");
 				addDataRow(columns);
-			
+
 			}
 			row = "Total|" + total + "|";
 			addTotalRow(row.split("\\|"));
-			
+
 			this.endTableData();
-			
+
 			this.Close();
-		} catch (IOException ioe){}
+		} catch (IOException ioe) {
+		}
 		return this.getOutFile();
 	}
-	
+
 	@Override
 	public void addHeaderRow(String[] columns) throws IOException {
-		
+
 		this.startRow();
 		int pos = 0;
-		for (int i=1; i<columns.length; i++) {
-			pos = columns.length-i;
+		for (int i = 1; i < columns.length; i++) {
+			pos = columns.length - i;
 			this.addHeader(columns[pos]);
 		}
 		this.endRow();
-		
+
 	}
-	
+
 	@Override
-	public void addDataRow(String[] columns) throws IOException{
-		
-		this.startRow(rowColors.get("bankback"),
-					rowColors.get("bankcolor"));
-		
+	public void addDataRow(String[] columns) throws IOException {
+
+		this.startRow(rowColors.get("bankback"), rowColors.get("bankcolor"));
+
 		int pos = 0;
-		
-		for (int i=1; i<columns.length; i++) {
-			pos = columns.length-i;
-			if (i==2) {
+
+		for (int i = 1; i < columns.length; i++) {
+			pos = columns.length - i;
+			if (i == 2) {
 				long longVal = Long.parseLong(columns[pos]);
-				if (longVal < 0){
+				if (longVal < 0) {
 					longVal = -longVal;
 				}
 				total += longVal;
@@ -131,17 +131,16 @@
 		}
 		this.endRow();
 	}
-	
+
 	@Override
-	public void addTotalRow(String[] columns) throws IOException{
-		
-		this.startRow(rowColors.get("bankback"),
-					rowColors.get("bankcolor"));
-		
-		for (int i=0; i<columns.length; i++) {
-			if (i==1) {
+	public void addTotalRow(String[] columns) throws IOException {
+
+		this.startRow(rowColors.get("bankback"), rowColors.get("bankcolor"));
+
+		for (int i = 0; i < columns.length; i++) {
+			if (i == 1) {
 				long longVal = Long.parseLong(columns[i]);
-				if (longVal < 0){
+				if (longVal < 0) {
 					longVal = -longVal;
 				}
 				this.addTotal(longVal);
@@ -151,35 +150,37 @@
 		}
 		this.endRow();
 	}
-	
+
 	@Override
-	public void addChartRow(String row) throws IOException{
+	public void addChartRow(String row) throws IOException {
 		String[] columns = row.split("\\|");
 
-			this.startRow();
-		
-			this.addChartLabel(columns[4]);
-			String sChartVal = columns[3].replace('(', ' ').replace(')', ' ').trim();
-			
-			if (sChartVal == null || sChartVal.length()==0){
-				sChartVal = "0";
-			}
-			
-			long longVal = Long.parseLong(sChartVal);
-			if (longVal < 0){
-				longVal = -longVal;
-			}
-			
-			this.addChartValue(formatter.getAmountFormatted(longVal, NumberFormat.getNoCommaNoParems()));
-		
-			this.endRow();
+		this.startRow();
+
+		this.addChartLabel(columns[4]);
+		String sChartVal = columns[3].replace('(', ' ').replace(')', ' ')
+				.trim();
+
+		if (sChartVal == null || sChartVal.length() == 0) {
+			sChartVal = "0";
+		}
+
+		long longVal = Long.parseLong(sChartVal);
+		if (longVal < 0) {
+			longVal = -longVal;
+		}
+
+		this.addChartValue(formatter.getAmountFormatted(longVal,
+				NumberFormat.getNoCommaNoParems()));
+
+		this.endRow();
 	}
 
 	@Override
 	public void addChartRow(String row, String actType, float totalVal)
 			throws IOException {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 }

=== added file 'infinitypfm/src/main/java/org/infinitypfm/core/types/AccountTypes.java'
--- infinitypfm/src/main/java/org/infinitypfm/core/types/AccountTypes.java	1970-01-01 00:00:00 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/types/AccountTypes.java	2014-11-27 22:23:48 +0000
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2005-2013 Wayne Gray All rights reserved
+ * 
+ * This file is part of Infinity PFM.
+ * 
+ * Infinity PFM 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 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Infinity PFM 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 Infinity PFM.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.infinitypfm.core.types;
+
+public class AccountTypes {
+
+	public static final String BANK = "Bank";
+	
+}

=== added file 'infinitypfm/src/main/java/org/infinitypfm/core/types/ImportRuleNames.java'
--- infinitypfm/src/main/java/org/infinitypfm/core/types/ImportRuleNames.java	1970-01-01 00:00:00 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/core/types/ImportRuleNames.java	2014-11-27 22:23:48 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2005-2013 Wayne Gray All rights reserved
+ * 
+ * This file is part of Infinity PFM.
+ * 
+ * Infinity PFM 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 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Infinity PFM 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 Infinity PFM.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.infinitypfm.core.types;
+
+import org.infinitypfm.core.conf.MM;
+
+public class ImportRuleNames {
+
+	public static final String CONTAINS = MM.PHRASES.getPhrase("243");
+	public static final String STARTSWITH = MM.PHRASES.getPhrase("244");
+	public static final String ENDSWITH = MM.PHRASES.getPhrase("245");
+	
+}

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/ui/MainFrame.java'
--- infinitypfm/src/main/java/org/infinitypfm/ui/MainFrame.java	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/ui/MainFrame.java	2014-11-27 22:23:48 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2011 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2013 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -15,16 +15,13 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with Infinity PFM.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ */
 
 package org.infinitypfm.ui;
 
-
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ShellAdapter;
 import org.eclipse.swt.events.ShellEvent;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.FormAttachment;
@@ -44,9 +41,9 @@
 
 /**
  * @author Wayne Gray
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
+ * 
+ *         To change the template for this generated type comment go to
+ *         Window>Preferences>Java>Code Generation>Code and Comments
  */
 public class MainFrame {
 
@@ -54,57 +51,46 @@
 	private static Sash HorSash;
 	private FormData Vsashdata;
 	private FormData Hsashdata;
-	//private Color oColor = null;
-	private Font newFont=null;
 	public Label lblStatus = null;
-	
+
 	private MoneyTree trMain;
 	private ConsoleView msgMain;
 	private ViewHandler vwMain;
-	private MainMenu mnuMain; 
+	private MainMenu mnuMain;
 	private BaseToolbar cbMain;
 	private StatusView stMain;
 
-	//private QueueServers queueServers = null;
-	
-		
 	public MainFrame() {
 		super();
-		
-		//save inputs
+
+		// save inputs
 		InfinityPfm.shMain.addShellListener(new onClose());
-		
-		
+
 	}
-	
-	public void LoadUI(boolean bUseIcons){
+
+	public void LoadUI(boolean bUseIcons) {
 		InfinityPfm.shMain.setLayout(new FormLayout());
-		InfinityPfm.shMain.setText(MM.APPTITLE + " - " +
-				MM.PHRASES.getPhrase("63"));
-		InfinityPfm.shMain.setImage(InfinityPfm.imMain.getImage(MM.IMG_QUEZEN_ICON));
+		InfinityPfm.shMain.setText(MM.APPTITLE + " - "
+				+ MM.PHRASES.getPhrase("63"));
+		InfinityPfm.shMain.setImage(InfinityPfm.imMain
+				.getImage(MM.IMG_QUEZEN_ICON));
 
 		/*
 		 * Load Status Box
 		 */
 		stMain = new StatusView(InfinityPfm.shMain, SWT.FLAT);
-		
+
 		/*
 		 * Load Main Menu
 		 */
 		mnuMain = new MainMenu(InfinityPfm.shMain);
 		InfinityPfm.shMain.setMenuBar(mnuMain.getMenu());
-		
+
 		/*
 		 * Load Main Toolbar
 		 */
-		//if (bUseIcons==true){
-			cbMain = new MainToolbar(InfinityPfm.shMain);
-//		} else {
-//			cbMain = new MainToolbar(InfinityPfm.shMain);
-//		}
-
-
-		
+		cbMain = new MainToolbar(InfinityPfm.shMain);
+
 		/*
 		 * Load Tree
 		 */
@@ -114,299 +100,279 @@
 		 * Load View Handler
 		 */
 		vwMain = new ViewHandler();
-		
-		
-//		lblStatus = new Label(InfinityPfm.shMain, SWT.FLAT);
-//		lblStatus.setText("              ");
-//		lblStatus.setAlignment(SWT.CENTER);
-//		BigFont(lblStatus);
-//		oColor = new Color(InfinityPfm.shMain.getDisplay(), 255, 0, 0);
-//		lblStatus.setForeground(oColor);	
-		
-		
-		
-		
+
 	}
-	
-	public void Open(){
-		
+
+	public void Open() {
+
 		setListeners();
 		InfinityPfm.shMain.open();
 		VertSash.setFocus();
 		InfinityPfm.shMain.setSize(1024, 768);
-		
+
 	}
-	
 
-	public void LoadLayout(){
-		//create vertical sash
+	public void LoadLayout() {
+		// create vertical sash
 		VertSash = new Sash(InfinityPfm.shMain, SWT.FLAT | SWT.VERTICAL);
 		Vsashdata = new FormData();
 		Vsashdata.bottom = new FormAttachment(stMain, 0);
-		Vsashdata.left = new FormAttachment(20,0);
-		Vsashdata.top = new FormAttachment(cbMain.getToolbar(),0);
+		Vsashdata.left = new FormAttachment(20, 0);
+		Vsashdata.top = new FormAttachment(cbMain.getToolbar(), 0);
 		VertSash.setLayoutData(Vsashdata);
-		
-		//Bind other controls
+
+		// Bind other controls
 		FormData coolbardata = new FormData();
 		coolbardata.top = new FormAttachment(0, 0);
 		coolbardata.left = new FormAttachment(0, 0);
 		coolbardata.right = new FormAttachment(100, 0);
 		cbMain.getToolbar().setLayoutData(coolbardata);
-		
-//		FormData lblstatusdata = new FormData();
-//		lblstatusdata.top = new FormAttachment(0,5);
-//		lblstatusdata.left = new FormAttachment(InfinityPfm.cbMain.getToolbar(), 5);
-//		lblstatusdata.right = new FormAttachment(100, -5);
-//		lblStatus.setLayoutData(lblstatusdata);
-		
+
 		FormData stmaindata = new FormData();
 		stmaindata.left = new FormAttachment(0, 0);
 		stmaindata.bottom = new FormAttachment(100, 0);
 		stmaindata.top = new FormAttachment(100, -20);
 		stmaindata.right = new FormAttachment(100, 0);
 		stMain.setLayoutData(stmaindata);
-		
+
 		FormData trmaindata = new FormData();
 		trmaindata.left = new FormAttachment(0, 0);
 		trmaindata.right = new FormAttachment(VertSash, 0);
 		trmaindata.top = new FormAttachment(cbMain.getToolbar(), 0);
-		trmaindata.bottom = new FormAttachment(stMain,0);		
+		trmaindata.bottom = new FormAttachment(stMain, 0);
 		trMain.getTree().setLayoutData(trmaindata);
-		
+
 		FormData rightpanedata = new FormData();
 		rightpanedata.left = new FormAttachment(VertSash, 0);
 		rightpanedata.bottom = new FormAttachment(stMain, 0);
-		//rightpanedata.bottom = new FormAttachment(100, -25);
 		rightpanedata.top = new FormAttachment(cbMain.getToolbar(), 0);
 		rightpanedata.right = new FormAttachment(100, 0);
-		
+
 		vwMain.getParent().setLayoutData(rightpanedata);
-		
-		
-		
+
 	}
 
-	public Point getWindowCenter(){
+	public Point getWindowCenter() {
 		Point p = InfinityPfm.shMain.getLocation();
 		Rectangle rect = InfinityPfm.shMain.getBounds();
 		int xc = p.x + (rect.height / 2);
-		int yc = p.y + (rect.width /2);
+		int yc = p.y + (rect.width / 2);
 		p = null;
 		rect = null;
 		return new Point(xc, yc);
-	
+
 	}
-	
-	public void getRightPane(){
+
+	public void getRightPane() {
 		vwMain = new ViewHandler();
 	}
-	
-	public void LoadConsole(boolean bLoad){
-		if (bLoad && msgMain==null){
+
+	public void LoadConsole(boolean bLoad) {
+		if (bLoad && msgMain == null) {
 			msgMain = new ConsoleView(InfinityPfm.shMain);
-			
+
 			HorSash = new Sash(InfinityPfm.shMain, SWT.FLAT | SWT.HORIZONTAL);
 			Hsashdata = new FormData();
 			Hsashdata.left = new FormAttachment(0, 0);
-			Hsashdata.right = new FormAttachment(100,0);
-			Hsashdata.bottom = new FormAttachment(80,0);
+			Hsashdata.right = new FormAttachment(100, 0);
+			Hsashdata.bottom = new FormAttachment(80, 0);
 			HorSash.setLayoutData(Hsashdata);
-			
+
 			FormData rightbottpanedata = new FormData();
 			rightbottpanedata.left = new FormAttachment(0, 0);
 			rightbottpanedata.bottom = new FormAttachment(stMain, 0);
 			rightbottpanedata.top = new FormAttachment(HorSash, 0);
 			rightbottpanedata.right = new FormAttachment(100, 0);
 			msgMain.setLayoutData(rightbottpanedata);
-			
-			FormData data = (FormData)vwMain.getParent().getLayoutData();
+
+			FormData data = (FormData) vwMain.getParent().getLayoutData();
 			data.bottom = new FormAttachment(HorSash, 0);
 			Vsashdata.bottom = new FormAttachment(HorSash, 0);
 			data = (FormData) trMain.getTree().getLayoutData();
 			data.bottom = new FormAttachment(HorSash, 0);
-			
-			HorSash.addListener (SWT.Selection, new Listener () {
-				public void handleEvent (Event e) {
-				Rectangle sashRect = HorSash.getBounds ();
-				Rectangle shellRect = InfinityPfm.shMain.getClientArea ();
-				int right = shellRect.height - sashRect.height - 10;
-				e.y = Math.max (Math.min (e.y, right), 29);
-				
-				if (e.y != sashRect.y)  {
-					Hsashdata.bottom = new FormAttachment (0, e.y);
-					InfinityPfm.shMain.layout ();
+
+			HorSash.addListener(SWT.Selection, new Listener() {
+				public void handleEvent(Event e) {
+					Rectangle sashRect = HorSash.getBounds();
+					Rectangle shellRect = InfinityPfm.shMain.getClientArea();
+					int right = shellRect.height - sashRect.height - 10;
+					e.y = Math.max(Math.min(e.y, right), 29);
+
+					if (e.y != sashRect.y) {
+						Hsashdata.bottom = new FormAttachment(0, e.y);
+						InfinityPfm.shMain.layout();
+					}
 				}
-			}
 			});
-			
-		} else if (!bLoad && msgMain != null){
+
+		} else if (!bLoad && msgMain != null) {
 			msgMain.QZDispose();
 			msgMain = null;
-			if (!HorSash.isDisposed()){
+			if (!HorSash.isDisposed()) {
 				HorSash.dispose();
 			}
-			
-			FormData data = (FormData)vwMain.getParent().getLayoutData();
+
+			FormData data = (FormData) vwMain.getParent().getLayoutData();
 			data.bottom = new FormAttachment(stMain, 0);
 			Vsashdata.bottom = new FormAttachment(stMain, 0);
 			data = (FormData) trMain.getTree().getLayoutData();
 			data.bottom = new FormAttachment(stMain, 0);
-			data = (FormData)stMain.getLayoutData();
+			data = (FormData) stMain.getLayoutData();
 			data.top = new FormAttachment(100, -20);
 		}
 	}
-		
-	public void setListeners(){
-		
-		VertSash.addListener (SWT.Selection, new Listener () {
-		public void handleEvent (Event e) {
-			Rectangle sashRect = VertSash.getBounds ();
-			Rectangle shellRect = InfinityPfm.shMain.getClientArea ();
-			int right = shellRect.width - sashRect.width - 100;
-			e.x = Math.max (Math.min (e.x, right), 100);
-			if (e.x != sashRect.x)  {
-				Vsashdata.left = new FormAttachment (0, e.x);
-				InfinityPfm.shMain.layout ();
+
+	public void setListeners() {
+
+		VertSash.addListener(SWT.Selection, new Listener() {
+			public void handleEvent(Event e) {
+				Rectangle sashRect = VertSash.getBounds();
+				Rectangle shellRect = InfinityPfm.shMain.getClientArea();
+				int right = shellRect.width - sashRect.width - 100;
+				e.x = Math.max(Math.min(e.x, right), 100);
+				if (e.x != sashRect.x) {
+					Vsashdata.left = new FormAttachment(0, e.x);
+					InfinityPfm.shMain.layout();
+				}
 			}
-		}
-	});
-	
-	/*
-	HorSash.addListener (SWT.Selection, new Listener () {
-		public void handleEvent (Event e) {
-		Rectangle sashRect = HorSash.getBounds ();
-		Rectangle shellRect = InfinityPfm.shMain.getClientArea ();
-		int right = shellRect.height - sashRect.height - 10;
-		e.y = Math.max (Math.min (e.y, right), 29);
-		
-		if (e.y != sashRect.y)  {
-			Hsashdata.bottom = new FormAttachment (0, e.y);
-			InfinityPfm.shMain.layout ();
-		}
-	}
-	});
-	*/
-	
-//	lblStatus.addDisposeListener(new DisposeListener() {
-//		public void widgetDisposed(DisposeEvent e) {
-//			//get rid of fonts and colors used
-//			try{oColor.dispose();} catch (Exception dl){}
-//			try{newFont.dispose();} catch (Exception dl){}
-//		}
-//	});
-	}
-
-	public void QZDispose(){
-
-
-		//if (!HorSash.isDisposed()){
-			//HorSash.dispose();	
-		//}
-	}
-	
-	private void BigFont(Label lbl){
-		Font lblFont = lbl.getFont();
-		FontData[] lblFontData = lblFont.getFontData();
-		for (int i=0; i<lblFontData.length; i++){
-			lblFontData[i].setHeight(10);
-		}
-		newFont = new Font(InfinityPfm.shMain.getDisplay(), lblFontData);
-		lbl.setFont(newFont);
-		
-	}
-	
+		});
+
+	}
+
+	public void QZDispose() {
+	}
+
 	/**
 	 * @return Returns the cbMain.
 	 */
 	public BaseToolbar getCbMain() {
 		return cbMain;
 	}
+
 	/**
-	 * @param cbMain The cbMain to set.
+	 * @param cbMain
+	 *            The cbMain to set.
 	 */
 	public void setCbMain(BaseToolbar cbMain) {
 		this.cbMain = cbMain;
 	}
+
 	/**
 	 * @return Returns the mnuMain.
 	 */
 	public MainMenu getMnuMain() {
 		return mnuMain;
 	}
+
 	/**
-	 * @param mnuMain The mnuMain to set.
+	 * @param mnuMain
+	 *            The mnuMain to set.
 	 */
 	public void setMnuMain(MainMenu mnuMain) {
 		this.mnuMain = mnuMain;
 	}
+
 	/**
 	 * @return Returns the msgMain.
 	 */
 	public ConsoleView getMsgMain() {
 		return msgMain;
 	}
+
 	/**
-	 * @param msgMain The msgMain to set.
+	 * @param msgMain
+	 *            The msgMain to set.
 	 */
 	public void setMsgMain(ConsoleView msgMain) {
 		this.msgMain = msgMain;
 	}
+
 	/**
 	 * @return Returns the stMain.
 	 */
 	public StatusView getStMain() {
 		return stMain;
 	}
+
 	/**
-	 * @param stMain The stMain to set.
+	 * @param stMain
+	 *            The stMain to set.
 	 */
 	public void setStMain(StatusView stMain) {
 		this.stMain = stMain;
 	}
+
 	/**
 	 * @return Returns the trMain.
 	 */
 	public MoneyTree getTrMain() {
 		return trMain;
 	}
+
 	/**
-	 * @param trMain The trMain to set.
+	 * @param trMain
+	 *            The trMain to set.
 	 */
 	public void setTrMain(MoneyTree trMain) {
 		this.trMain = trMain;
 	}
+
 	/**
 	 * @return Returns the vwMain.
 	 */
 	public ViewHandler getVwMain() {
 		return vwMain;
 	}
+
 	/**
-	 * @param vwMain The vwMain to set.
+	 * @param vwMain
+	 *            The vwMain to set.
 	 */
 	public void setVwMain(ViewHandler vwMain) {
 		this.vwMain = vwMain;
 	}
+
 	class onClose extends ShellAdapter {
 		public void shellClosed(ShellEvent e) {
 
-			try {cbMain.QZDispose();} catch (Exception e1){}
-			try{mnuMain.QZDispose();} catch (Exception e2){}
-			try {trMain.QZDispose();} catch (Exception e3){}
-			try {InfinityPfm.imMain.QZDispose();} catch (Exception e5){}
-			try {vwMain.QZDispose();} catch (Exception e6){}
-			
+			try {
+				cbMain.QZDispose();
+			} catch (Exception e1) {
+				System.err.println(e1.getMessage());
+			}
+			try {
+				mnuMain.QZDispose();
+			} catch (Exception e2) {
+				System.err.println(e2.getMessage());
+			}
+			try {
+				trMain.QZDispose();
+			} catch (Exception e3) {
+				System.err.println(e3.getMessage());
+			}
+			try {
+				InfinityPfm.imMain.QZDispose();
+			} catch (Exception e5) {
+				System.err.println(e5.getMessage());
+			}
+			try {
+				vwMain.QZDispose();
+			} catch (Exception e6) {
+				System.err.println(e6.getMessage());
+			}
 
-			if (!VertSash.isDisposed()){
+			if (!VertSash.isDisposed()) {
 				VertSash.dispose();
 			}
-			
-			try {msgMain.QZDispose();} catch (Exception e4){}
-			
+
+			try {
+				msgMain.QZDispose();
+			} catch (Exception e4) {
+			}
+
 			super.shellClosed(e);
-		
+
 		}
-}
+	}
 
 }

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/ui/MoneyTree.java'
--- infinitypfm/src/main/java/org/infinitypfm/ui/MoneyTree.java	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/ui/MoneyTree.java	2014-11-27 22:23:48 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2011 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2013 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -15,14 +15,13 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with Infinity PFM.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ */
 
 package org.infinitypfm.ui;
 
 import java.sql.SQLException;
 import java.util.List;
 
-
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -36,26 +35,17 @@
 import org.infinitypfm.core.conf.MM;
 import org.infinitypfm.core.data.Account;
 import org.infinitypfm.core.data.Budget;
-import org.infinitypfm.graphics.ImageMap;
 import org.infinitypfm.ui.view.menus.BudgetMenu;
 import org.infinitypfm.ui.view.menus.TreeMenu;
 
 /**
  * @author Wayne Gray
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
  */
 public class MoneyTree {
 
-	
 	private Tree trMain;
 	private TreeMenu mnuPopup = null;
 	private BudgetMenu mnuBudget = null;
-	private ImageMap imIcons = null;
-	//private HashMap hmServers = new HashMap();
-	//private String sCurrServer = null;
-	//private BackgroundLoader thBackgroundLoader = null;
 	private TreeNodeInfo bookmarks = null;
 	private Shell shMain = null;
 	private Account actSelected = null;
@@ -63,306 +53,289 @@
 
 	public MoneyTree(Shell sh) {
 		super();
-		
+
 		shMain = sh;
-		
-		trMain = new Tree(shMain, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.SINGLE);
+
+		trMain = new Tree(shMain, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL
+				| SWT.SINGLE);
 		trMain.addSelectionListener(on_Click);
-		
+
 		bookmarks = new TreeNodeInfo();
-		//Reload();
-		
-		
-		imIcons = InfinityPfm.imMain;
-		
-		//init popup menus
+
+		// init popup menus
 		mnuPopup = new TreeMenu(shMain);
 		mnuBudget = new BudgetMenu(shMain);
-		
-	
+
 	}
-	
-	public void Reload(){
+
+	public void Reload() {
 		BackgroundLoader bl = new BackgroundLoader();
 		new Thread(bl).start();
 	}
-	
-	private void ReLoadTree(){
-		
-
-		//clear the tree
+
+	private void ReLoadTree() {
+
+		// clear the tree
 		trMain.removeAll();
-		
-		//set up root nodes
-		TreeItem budgetNode = new TreeItem(trMain,0);
+
+		// set up root nodes
+		TreeItem budgetNode = new TreeItem(trMain, 0);
 		budgetNode.setText(MM.PHRASES.getPhrase("97"));
 		budgetNode.setData("budget");
 		budgetNode.setImage(InfinityPfm.imMain.getImage(MM.IMG_JMSITEM));
-		bookmarks.setBudgetNode(budgetNode);		
+		bookmarks.setBudgetNode(budgetNode);
 		TreeItem bankNode = new TreeItem(trMain, 1);
 		bankNode.setText(MM.PHRASES.getPhrase("8"));
 		bankNode.setData("bank");
 		bankNode.setImage(InfinityPfm.imMain.getImage(MM.IMG_JMSITEM));
 		bookmarks.setBankAccountNode(bankNode);
-		TreeItem liabilityNode = new TreeItem(trMain,2);
+		TreeItem liabilityNode = new TreeItem(trMain, 2);
 		liabilityNode.setText(MM.PHRASES.getPhrase("53"));
 		liabilityNode.setData("liability");
 		liabilityNode.setImage(InfinityPfm.imMain.getImage(MM.IMG_JMSITEM));
-		TreeItem expenseNode = new TreeItem(trMain,3);
+		TreeItem expenseNode = new TreeItem(trMain, 3);
 		expenseNode.setText(MM.PHRASES.getPhrase("9"));
 		expenseNode.setData("expense");
 		expenseNode.setImage(InfinityPfm.imMain.getImage(MM.IMG_JMSITEM));
 		bookmarks.setExpenseNode(expenseNode);
-		TreeItem incomeNode = new TreeItem(trMain,4);
+		TreeItem incomeNode = new TreeItem(trMain, 4);
 		incomeNode.setText(MM.PHRASES.getPhrase("10"));
 		incomeNode.setData("income");
 		incomeNode.setImage(InfinityPfm.imMain.getImage(MM.IMG_JMSITEM));
-		
-		
-	    //TODO:  Remove duplication of code below for each account type.
-		
+
+		// TODO: Remove duplication of code below for each account type.
+
 		try {
 
 			TreeItem ti = null;
 			Account act = null;
-			
-			//add bank accounts		
-			List bankList = MM.sqlMap.queryForList("getAccountsForType", "Bank");
-		
-			if (bankList!=null){
-	    
-				for (int i=0; i<bankList.size(); i++){
-					act = (Account)bankList.get(i);
-					ti = new TreeItem(bankNode,i);
-					ti.setText(act.getActName());
-					ti.setData(act);
-					ti.setImage(InfinityPfm.imMain.getImage(MM.IMG_TREELEAF));
-					System.out.println(act.getActName() + ":" + Integer.toString(act.getActId()));
-					
-				}
-	    	
-			}
-			
-			//add liability accounts		
-			List liabilityList = MM.sqlMap.queryForList("getAccountsForType", "Liability");
-		
-			if (liabilityList!=null){
-	    
-				for (int i=0; i<liabilityList.size(); i++){
-					act = (Account)liabilityList.get(i);
-					ti = new TreeItem(liabilityNode,i);
-					ti.setText(act.getActName());
-					ti.setData(act);
-					ti.setImage(InfinityPfm.imMain.getImage(MM.IMG_TREELEAF));
-					System.out.println(act.getActName() + ":" + Integer.toString(act.getActId()));
-						
-				}
-	    	
-			}
-			
-			//add expense accounts		
-			List expenseList = MM.sqlMap.queryForList("getAccountsForType", "Expense");
-		
-			if (expenseList!=null){
-	    
-				for (int i=0; i<expenseList.size(); i++){
-					act = (Account)expenseList.get(i);
-					ti = new TreeItem(expenseNode,i);
-					ti.setText(act.getActName());
-					ti.setData(act);
-					ti.setImage(InfinityPfm.imMain.getImage(MM.IMG_TREELEAF));
-				}
-	    	
-			}
-			
-			//add income accounts		
-			List incomeList = MM.sqlMap.queryForList("getAccountsForType", "Income");
-		
-			if (incomeList!=null){
-	    
-				for (int i=0; i<incomeList.size(); i++){
-					act = (Account)incomeList.get(i);
-					ti = new TreeItem(incomeNode,i);
-					ti.setText(act.getActName());
-					ti.setData(act);
-					ti.setImage(InfinityPfm.imMain.getImage(MM.IMG_TREELEAF));
-				}
-	    	
-			}
-	    
-			//add budgets
+
+			// add bank accounts
+			@SuppressWarnings("rawtypes")
+			List bankList = MM.sqlMap
+					.queryForList("getAccountsForType", "Bank");
+
+			if (bankList != null) {
+
+				for (int i = 0; i < bankList.size(); i++) {
+					act = (Account) bankList.get(i);
+					ti = new TreeItem(bankNode, i);
+					ti.setText(act.getActName());
+					ti.setData(act);
+					ti.setImage(InfinityPfm.imMain.getImage(MM.IMG_TREELEAF));
+					System.out.println(act.getActName() + ":"
+							+ Integer.toString(act.getActId()));
+
+				}
+
+			}
+
+			// add liability accounts
+			@SuppressWarnings("rawtypes")
+			List liabilityList = MM.sqlMap.queryForList("getAccountsForType",
+					"Liability");
+
+			if (liabilityList != null) {
+
+				for (int i = 0; i < liabilityList.size(); i++) {
+					act = (Account) liabilityList.get(i);
+					ti = new TreeItem(liabilityNode, i);
+					ti.setText(act.getActName());
+					ti.setData(act);
+					ti.setImage(InfinityPfm.imMain.getImage(MM.IMG_TREELEAF));
+					System.out.println(act.getActName() + ":"
+							+ Integer.toString(act.getActId()));
+
+				}
+
+			}
+
+			// add expense accounts
+			@SuppressWarnings("rawtypes")
+			List expenseList = MM.sqlMap.queryForList("getAccountsForType",
+					"Expense");
+
+			if (expenseList != null) {
+
+				for (int i = 0; i < expenseList.size(); i++) {
+					act = (Account) expenseList.get(i);
+					ti = new TreeItem(expenseNode, i);
+					ti.setText(act.getActName());
+					ti.setData(act);
+					ti.setImage(InfinityPfm.imMain.getImage(MM.IMG_TREELEAF));
+				}
+
+			}
+
+			// add income accounts
+			@SuppressWarnings("rawtypes")
+			List incomeList = MM.sqlMap.queryForList("getAccountsForType",
+					"Income");
+
+			if (incomeList != null) {
+
+				for (int i = 0; i < incomeList.size(); i++) {
+					act = (Account) incomeList.get(i);
+					ti = new TreeItem(incomeNode, i);
+					ti.setText(act.getActName());
+					ti.setData(act);
+					ti.setImage(InfinityPfm.imMain.getImage(MM.IMG_TREELEAF));
+				}
+
+			}
+
+			// add budgets
+			@SuppressWarnings("rawtypes")
 			List budgetList = MM.sqlMap.queryForList("getAllBudgets", null);
-	    
-			if (budgetList != null){
+
+			if (budgetList != null) {
 				Budget budget = null;
-				for (int i=0; i<budgetList.size();i++){
-					budget = (Budget)budgetList.get(i);
+				for (int i = 0; i < budgetList.size(); i++) {
+					budget = (Budget) budgetList.get(i);
 					ti = new TreeItem(budgetNode, i);
 					ti.setText(budget.getBudgetName());
 					ti.setData(budget);
 					ti.setImage(InfinityPfm.imMain.getImage(MM.IMG_DOLLAR));
 				}
 			}
-			
-		
-		} catch (SQLException se){
+
+		} catch (SQLException se) {
 			InfinityPfm.LogMessage(se.getMessage());
 		}
-		
+
 		bankNode.setExpanded(true);
 		liabilityNode.setExpanded(true);
 		incomeNode.setExpanded(true);
 		expenseNode.setExpanded(true);
 		budgetNode.setExpanded(true);
-	
+
 	}
 
-	public Tree getTree(){
+	public Tree getTree() {
 		return trMain;
 	}
-	
+
 	private TreeItem getItem(String sName) {
-		TreeItem ti=null;
-		TreeItem [] aTI = trMain.getItems();
-		
-		for (int i=0; i< trMain.getItemCount(); i++) {
+		TreeItem ti = null;
+		TreeItem[] aTI = trMain.getItems();
+
+		for (int i = 0; i < trMain.getItemCount(); i++) {
 			if (sName.equals(aTI[i].getText())) {
-				ti=aTI[i];
+				ti = aTI[i];
 			}
 		}
 		return ti;
 	}
-	
-	public void setItemSelected(String sName){
+
+	public void setItemSelected(String sName) {
 		TreeItem ti = getItem(sName);
-		if (ti!=null){
-			TreeItem[] aTI = {ti};
+		if (ti != null) {
+			TreeItem[] aTI = { ti };
 			trMain.setSelection(aTI);
-			trMain.showItem(ti); 
+			trMain.showItem(ti);
 		}
 	}
-	
-	public Account getSelectedAccount(){
+
+	public Account getSelectedAccount() {
 		return actSelected;
 	}
-	
-	public Budget getSelectedBudget(){
+
+	public Budget getSelectedBudget() {
 		return budgetSelected;
 	}
-	
-	public void QZDispose(){
-		
+
+	public void QZDispose() {
+
 		mnuPopup.QZDispose();
-		
-//		if(thBackgroundLoader!=null){
-//			thBackgroundLoader.notifyAll();
-//			thBackgroundLoader = null;
-//		}
-		
-		if (!trMain.isDisposed()){
+
+		if (!trMain.isDisposed()) {
 			trMain.dispose();
 		}
 	}
-	
-	public void setConnected(String qs, boolean bConnected){
-		//ti.setImage(InfinityPfm.imMain.getImage(MM.IMG_CONNECTED));
-		
+
+	public void setConnected(String qs, boolean bConnected) {
+
 	}
-	
+
 	private class BackgroundLoader implements Runnable {
-		
-			/* (non-Javadoc)
-		 * @see java.lang.Runnable#run()
-		 */
+
 		public void run() {
-				
+
 			Display.getDefault().syncExec(new BusyStatus(true));
 			Display.getDefault().syncExec(new TreeLoader());
 			Display.getDefault().syncExec(new BusyStatus(false));
-			
-			}
+
+		}
 	}
-	
 
 	private class TreeLoader implements Runnable {
-		
-		
-		public TreeLoader(){
-			
+
+		public TreeLoader() {
+
 		}
-		
+
 		public void run() {
-			
+
 			ReLoadTree();
 		}
-		
-		protected void AddAccountSection(TreeItem parent, java.util.List actList){
-			
-		}
-		
 	}
 
 	private class BusyStatus implements Runnable {
-		
+
 		boolean busy = false;
 
-		public BusyStatus (boolean bStatus){
+		public BusyStatus(boolean bStatus) {
 			busy = bStatus;
 		}
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Runnable#run()
-		 */
+
 		public void run() {
 			InfinityPfm.qzMain.getStMain().setBusy(busy);
 		}
-		
-		
+
 	}
 
 	/*
-	 *
+	 * 
 	 * Listeners
 	 */
-	
-	SelectionAdapter on_Click = new SelectionAdapter(){
-	public void widgetSelected(SelectionEvent e){
-		
-		TreeItem ti = (TreeItem)e.item;
-		Object obj = ti.getData();
-		
-		trMain.setMenu(null);
-		
-		if (obj==null){
-			return;
-		}
-		
-		MainAction action = new MainAction();
-		
-		if (obj instanceof Account){
-			trMain.setMenu(mnuPopup.getMenu());
-			actSelected = (Account)obj;
-			budgetSelected = null;
-			action.LoadView(MM.VIEW_REGISTER);
-		} else if (obj instanceof Budget){
-			trMain.setMenu(mnuBudget.getMenu());
-			actSelected = null;
-			budgetSelected = (Budget)obj;
-			action.LoadView(MM.VIEW_BUDGET);
-		} else if (obj instanceof String) {
-			String acctType = obj.toString();
-			if (acctType.equalsIgnoreCase("bank") ||
-					acctType.equalsIgnoreCase("expense") ||
-					acctType.equalsIgnoreCase("liability") ||
-					acctType.equalsIgnoreCase("income")) {
-				
+
+	SelectionAdapter on_Click = new SelectionAdapter() {
+		public void widgetSelected(SelectionEvent e) {
+
+			TreeItem ti = (TreeItem) e.item;
+			Object obj = ti.getData();
+
+			trMain.setMenu(null);
+
+			if (obj == null) {
+				return;
+			}
+
+			MainAction action = new MainAction();
+
+			if (obj instanceof Account) {
 				trMain.setMenu(mnuPopup.getMenu());
-				
+				actSelected = (Account) obj;
+				budgetSelected = null;
+				action.LoadView(MM.VIEW_REGISTER);
+			} else if (obj instanceof Budget) {
+				trMain.setMenu(mnuBudget.getMenu());
+				actSelected = null;
+				budgetSelected = (Budget) obj;
+				action.LoadView(MM.VIEW_BUDGET);
+			} else if (obj instanceof String) {
+				String acctType = obj.toString();
+				if (acctType.equalsIgnoreCase("bank")
+						|| acctType.equalsIgnoreCase("expense")
+						|| acctType.equalsIgnoreCase("liability")
+						|| acctType.equalsIgnoreCase("income")) {
+
+					trMain.setMenu(mnuPopup.getMenu());
+
+				}
 			}
+
 		}
-		
-  }
-};
+	};
 
 }
-

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/ui/ViewHandler.java'
--- infinitypfm/src/main/java/org/infinitypfm/ui/ViewHandler.java	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/ui/ViewHandler.java	2014-11-27 22:23:48 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2011 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2013 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -15,11 +15,10 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with Infinity PFM.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ */
 
 package org.infinitypfm.ui;
 
-
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.PaintEvent;
 import org.eclipse.swt.events.PaintListener;
@@ -27,231 +26,227 @@
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.FormAttachment;
 import org.eclipse.swt.layout.FormData;
 import org.eclipse.swt.layout.FormLayout;
 import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.infinitypfm.client.InfinityPfm;
 import org.infinitypfm.core.conf.MM;
 import org.infinitypfm.ui.view.dialogs.MessageDialog;
-import org.infinitypfm.ui.view.views.*;
-
+import org.infinitypfm.ui.view.views.BaseView;
+import org.infinitypfm.ui.view.views.BudgetView;
+import org.infinitypfm.ui.view.views.CurrencyView;
+import org.infinitypfm.ui.view.views.RecurrenceView;
+import org.infinitypfm.ui.view.views.RegisterView;
+import org.infinitypfm.ui.view.views.ReportView;
 
 /**
  * @author Wayne Gray
- *
+ * 
  */
 public class ViewHandler {
 
 	private Composite cmpMain;
 	private Composite cmpWin;
 	private Shell sh = InfinityPfm.shMain;
-	private int lPluginCount=0;
-	//private Label lblMsg = null;
 	private Canvas canvas = null;
-	private final Image banner = InfinityPfm.imMain.getTransparentImage(MM.IMG_QUEZEN_BANNER);
-	private boolean bShrink = false;
+	private final Image banner = InfinityPfm.imMain
+			.getTransparentImage(MM.IMG_QUEZEN_BANNER);
 
-	public ViewHandler(){
+	public ViewHandler() {
 		cmpWin = new Composite(sh, SWT.BORDER);
 		cmpWin.setLayout(new FormLayout());
-		
+
 	}
 
-	private Composite getDefaultView(){
+	private Composite getDefaultView() {
 		Composite cmpResult = new Composite(cmpWin, SWT.FLAT);
 		cmpResult.setLayout(new FormLayout());
-		
-		
+
 		FormData cmpresultdata = new FormData();
 		cmpresultdata.top = new FormAttachment(0, 0);
-		cmpresultdata.left = new FormAttachment(0,0);
-		cmpresultdata.right = new FormAttachment(100,0);
-		cmpresultdata.bottom = new FormAttachment(100,0);
+		cmpresultdata.left = new FormAttachment(0, 0);
+		cmpresultdata.right = new FormAttachment(100, 0);
+		cmpresultdata.bottom = new FormAttachment(100, 0);
 		cmpResult.setLayoutData(cmpresultdata);
-		
-		Color color = new Color(InfinityPfm.shMain.getDisplay(), 255,255,255);
+
+		Color color = new Color(InfinityPfm.shMain.getDisplay(), 255, 255, 255);
 		cmpResult.setBackground(color);
-		
-		canvas = new Canvas(cmpResult,SWT.NONE);
+
+		canvas = new Canvas(cmpResult, SWT.NONE);
 		canvas.setBackground(color);
 		canvas.addPaintListener(new PaintListener() {
-	        public void paintControl(PaintEvent e) {
-	         e.gc.drawImage(banner,0,0);
-	        }
-	    });
-			
+			public void paintControl(PaintEvent e) {
+				e.gc.drawImage(banner, 0, 0);
+			}
+		});
+
 		FormData canvasdata = new FormData();
 		canvasdata.top = new FormAttachment(35, 0);
-		canvasdata.left = new FormAttachment(30,0);
-		canvasdata.right = new FormAttachment(70,0);
-		canvasdata.bottom = new FormAttachment(70,0);
+		canvasdata.left = new FormAttachment(30, 0);
+		canvasdata.right = new FormAttachment(70, 0);
+		canvasdata.bottom = new FormAttachment(70, 0);
 		canvas.setLayoutData(canvasdata);
-		
+
 		return cmpResult;
 	}
-	
+
 	public void LoadView(BaseView oView) {
-	
-		try{
-			if(!cmpMain.isDisposed()){
+
+		try {
+			if (!cmpMain.isDisposed()) {
 				cmpMain.dispose();
 			}
-		} catch (Exception e){};
-		
+		} catch (Exception e) {
+		}
+
 		cmpMain = oView;
-		
+
 		cmpMain.setVisible(true);
 		cmpWin.layout(true);
 
 	}
 
-	public void LoadDefaultView(){
-		
-		try{
-			if(!cmpMain.isDisposed()){
+	public void LoadDefaultView() {
+
+		try {
+			if (!cmpMain.isDisposed()) {
 				cmpMain.dispose();
 			}
-		} catch (Exception e){};
-		
+		} catch (Exception e) {
+		}
+		;
+
 		cmpMain = this.getDefaultView();
 		cmpMain.setVisible(true);
 		cmpWin.layout(true);
 	}
-	
-	public void UnloadCurrentView(){
-		if(!cmpMain.isDisposed()){
+
+	public void UnloadCurrentView() {
+		if (!cmpMain.isDisposed()) {
 			cmpMain.dispose();
 		}
 		cmpMain = getDefaultView();
-		
+
 	}
 
-	public void RefreshCurrentView(){
+	public void RefreshCurrentView() {
 		try {
-			((BaseView)cmpMain).Refresh();
-		} catch (Exception e){}
+			((BaseView) cmpMain).Refresh();
+		} catch (Exception e) {
+			System.err.println(e.getMessage());
+		}
 	}
 
-	public Composite getCurrentView(){
+	public Composite getCurrentView() {
 		return cmpMain;
 	}
-	
+
 	public Composite getParent() {
-		return cmpWin; 
+		return cmpWin;
 	}
-	
+
 	public void QZDispose() {
-		
-		if (!banner.isDisposed()){
+
+		if (!banner.isDisposed()) {
 			banner.dispose();
 		}
-		
-		if (!canvas.isDisposed()){
+
+		if (!canvas.isDisposed()) {
 			canvas.dispose();
 		}
 
-//		if (!lblMsg.isDisposed()){
-//			lblMsg.dispose();
-//		}
-		
-		if (!cmpMain.isDisposed()){
+		if (!cmpMain.isDisposed()) {
 			cmpMain.dispose();
 		}
-		
-		if (!cmpWin.isDisposed()){
+
+		if (!cmpWin.isDisposed()) {
 			cmpWin.dispose();
 		}
-		
+
 	}
-	
-	
-    public BaseView getView(int iViewID){
-		
+
+	public BaseView getView(int iViewID) {
+
 		BaseView vw = null;
-	
-		if (iViewID == MM.VIEW_SCRATCH){
-			//vw = new ScrachView(MM.qzMain.getVwMain().getParent(), SWT.NONE);
-			//MM.qzMain.getTrMain().setConnected(qs);
-		} else if (iViewID==MM.VIEW_REGISTER){
+
+		if (iViewID == MM.VIEW_REGISTER) {
 			vw = new RegisterView(cmpWin, SWT.NONE);
-		} else if (iViewID==MM.VIEW_BUDGET){
+		} else if (iViewID == MM.VIEW_BUDGET) {
 			vw = new BudgetView(cmpWin, SWT.NONE);
-		} else if (iViewID==MM.VIEW_RECURRENCE){
+		} else if (iViewID == MM.VIEW_RECURRENCE) {
 			vw = new RecurrenceView(cmpWin, SWT.NONE);
-		} else if (iViewID==MM.VIEW_CURRENCY){
+		} else if (iViewID == MM.VIEW_CURRENCY) {
 			vw = new CurrencyView(cmpWin, SWT.NONE);
 		} else {
-		
+
 			return null;
 		}
-		
+
 		vw.setLayout(new FormLayout());
-		
+
 		FormData cmpmaindata = new FormData();
-		cmpmaindata.top = new FormAttachment(0,0);
-		cmpmaindata.left = new FormAttachment(0,0);
-		cmpmaindata.bottom = new FormAttachment(100,0);
-		cmpmaindata.right = new FormAttachment(100,0);
+		cmpmaindata.top = new FormAttachment(0, 0);
+		cmpmaindata.left = new FormAttachment(0, 0);
+		cmpmaindata.bottom = new FormAttachment(100, 0);
+		cmpmaindata.right = new FormAttachment(100, 0);
 		vw.setLayoutData(cmpmaindata);
-		
+
 		return vw;
 
 	}
-    
-    public void LoadReportView(String sReport){
-    	
-    	
-	try {
-		ReportView reportView = new ReportView(cmpWin, SWT.NONE);
-		
-	    	reportView.setBackground(InfinityPfm.shMain.getDisplay().getSystemColor(SWT.COLOR_WHITE));
-    	
-	    	reportView.setLayout(new FormLayout());
-		
-		reportView.setReportUrl(sReport);
-		
-		FormData cmpmaindata = new FormData();
-		cmpmaindata.top = new FormAttachment(0,0);
-		cmpmaindata.left = new FormAttachment(0,0);
-		cmpmaindata.bottom = new FormAttachment(100,0);
-		cmpmaindata.right = new FormAttachment(100,0);
-		reportView.setLayoutData(cmpmaindata);
-		
-		
-		
-		try{
-			if(!cmpMain.isDisposed()){
-				cmpMain.dispose();
+
+	public void LoadReportView(String sReport) {
+
+		try {
+			ReportView reportView = new ReportView(cmpWin, SWT.NONE);
+
+			reportView.setBackground(InfinityPfm.shMain.getDisplay()
+					.getSystemColor(SWT.COLOR_WHITE));
+
+			reportView.setLayout(new FormLayout());
+
+			reportView.setReportUrl(sReport);
+
+			FormData cmpmaindata = new FormData();
+			cmpmaindata.top = new FormAttachment(0, 0);
+			cmpmaindata.left = new FormAttachment(0, 0);
+			cmpmaindata.bottom = new FormAttachment(100, 0);
+			cmpmaindata.right = new FormAttachment(100, 0);
+			reportView.setLayoutData(cmpmaindata);
+
+			try {
+				if (!cmpMain.isDisposed()) {
+					cmpMain.dispose();
+				}
+			} catch (Exception e) {
 			}
-		} catch (Exception e){};
-		
-		cmpMain = reportView;
-		cmpMain.setVisible(true);
-		cmpWin.layout(true);
-	} catch (Exception e) {
-	
-		MessageDialog show = new MessageDialog(MM.DIALOG_INFO,
-				MM.APPTITLE, e.getMessage());
-		show.Open();
+			;
+
+			cmpMain = reportView;
+			cmpMain.setVisible(true);
+			cmpWin.layout(true);
+		} catch (Exception e) {
+
+			MessageDialog show = new MessageDialog(MM.DIALOG_INFO, MM.APPTITLE,
+					e.getMessage());
+			show.Open();
+
+		}
 
 	}
-    	
-    }
-	
+
 	/*
-	 *  Listeners 
+	 * Listeners
 	 */
-	
+
 	SelectionAdapter on_Click = new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e){
+		public void widgetSelected(SelectionEvent e) {
 
 		}
-	
+
 	};
 
 }

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/ui/view/dialogs/AccountSelectorDialog.java'
--- infinitypfm/src/main/java/org/infinitypfm/ui/view/dialogs/AccountSelectorDialog.java	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/ui/view/dialogs/AccountSelectorDialog.java	2014-11-27 22:23:48 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2011 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2013 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -15,12 +15,11 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with Infinity PFM.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ */
 package org.infinitypfm.ui.view.dialogs;
 
 import java.sql.SQLException;
 
-
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -45,15 +44,15 @@
 	private Button cmdSelect = null;
 	private Button cmdCancel = null;
 	private String accountName = null;
-	
+
+	public boolean includeIncomeAccounts = false;
 	
 	public AccountSelectorDialog() {
 		super();
-		// TODO Auto-generated constructor stub
 	}
 
 	protected void LoadUI(Shell sh) {
-		
+
 		lblAccount = new Label(sh, SWT.NONE);
 		lblAccount.setText(MM.PHRASES.getPhrase("93"));
 		cmdSelect = new Button(sh, SWT.PUSH);
@@ -62,70 +61,79 @@
 		cmdCancel = new Button(sh, SWT.PUSH);
 		cmdCancel.setText(MM.PHRASES.getPhrase("4"));
 		cmdCancel.addSelectionListener(cmdCancel_OnClick);
-		
+
 		cmbAccount = new Combo(sh, SWT.DROP_DOWN | SWT.READ_ONLY);
-	
-		//TODO: Create a UI utility class to handle common tasks such as below
-		//        load of accounts into a combo
-		
+
+		// TODO: Create a UI utility class to handle common tasks such as below
+		// load of accounts into a combo
+
 		try {
 			Account act = null;
-			java.util.List list = MM.sqlMap.queryForList("getAccountsForType", MM.ACT_TYPE_EXPENSE);
-			
+			@SuppressWarnings("rawtypes")
+			java.util.List list = MM.sqlMap.queryForList("getAccountsForType",
+					MM.ACT_TYPE_EXPENSE);
+
 			cmbAccount.removeAll();
-			
-			for (int i=0; i<list.size(); i++) {
-				act = (Account)list.get(i);
-				cmbAccount.add(act.getActName());
+
+			for (int i = 0; i < list.size(); i++) {
+				act = (Account) list.get(i);
+				cmbAccount.add(act.getActName());
+
+			}
+			list = MM.sqlMap.queryForList("getAccountsForType",
+					MM.ACT_TYPE_LIABILITY);
+
+			for (int i = 0; i < list.size(); i++) {
+				act = (Account) list.get(i);
+				cmbAccount.add(act.getActName());
+
+			}
+
+			if (includeIncomeAccounts){
 				
-			}			
-			list = MM.sqlMap.queryForList("getAccountsForType", MM.ACT_TYPE_LIABILITY);
-			
-			for (int i=0; i<list.size(); i++) {
-				act = (Account)list.get(i);
-				cmbAccount.add(act.getActName());
+				list = MM.sqlMap.queryForList("getAccountsForType",
+						MM.ACT_TYPE_INCOME);
+
+				for (int i = 0; i < list.size(); i++) {
+					act = (Account) list.get(i);
+					cmbAccount.add(act.getActName());
+
+				}
 				
 			}
 			
 			cmbAccount.select(0);
-			
-		} catch (SQLException se){
+
+		} catch (SQLException se) {
 			InfinityPfm.LogMessage(se.getMessage());
 		}
-		
 
 	}
-	
+
 	protected void LoadLayout() {
 		FormData lblaccountdata = new FormData();
 		lblaccountdata.top = new FormAttachment(0, 40);
 		lblaccountdata.left = new FormAttachment(20, 0);
 		lblAccount.setLayoutData(lblaccountdata);
-		
+
 		FormData cmbaccountdata = new FormData();
 		cmbaccountdata.top = new FormAttachment(0, 40);
 		cmbaccountdata.left = new FormAttachment(lblAccount, 10);
 		cmbaccountdata.right = new FormAttachment(100, -30);
 		cmbAccount.setLayoutData(cmbaccountdata);
-		
+
 		FormData cmdcanceldata = new FormData();
 		cmdcanceldata.top = new FormAttachment(lblAccount, 40);
-		//cmdcanceldata.left = new FormAttachment(cmdOne, 10);
-		cmdcanceldata.right = new FormAttachment(40,10);
+		cmdcanceldata.right = new FormAttachment(40, 10);
 		cmdCancel.setLayoutData(cmdcanceldata);
 
 		FormData cmdadddata = new FormData();
 		cmdadddata.top = new FormAttachment(lblAccount, 40);
 		cmdadddata.left = new FormAttachment(cmdCancel, 10);
-		cmdadddata.right = new FormAttachment(60,10);
+		cmdadddata.right = new FormAttachment(60, 10);
 		cmdSelect.setLayoutData(cmdadddata);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see net.mogray.quezen.ui.view.QZDialog#Open()
-	 */
 	public int Open() {
 		super.Open();
 		shell.setText(MM.PHRASES.getPhrase("139"));
@@ -141,9 +149,7 @@
 
 		return 1;
 	}
-	
-	
-	
+
 	public String getAccountName() {
 		return accountName;
 	}
@@ -151,24 +157,26 @@
 	public void setAccountName(String accountName) {
 		this.accountName = accountName;
 	}
-
-
+	
+	public void setIncludeIncomeAccounts(boolean include){
+		includeIncomeAccounts = include;
+	}
 
 	/*
 	 * Listeners
 	 */
 	SelectionAdapter cmdSelect_OnClick = new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e){
+		public void widgetSelected(SelectionEvent e) {
 			accountName = cmbAccount.getText();
 			shell.dispose();
 		}
 	};
 
 	SelectionAdapter cmdCancel_OnClick = new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e){
+		public void widgetSelected(SelectionEvent e) {
 			userCancelled = true;
 			shell.dispose();
 		}
 	};
-	
+
 }

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/ui/view/dialogs/BudgetSelector.java'
--- infinitypfm/src/main/java/org/infinitypfm/ui/view/dialogs/BudgetSelector.java	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/ui/view/dialogs/BudgetSelector.java	2014-11-27 22:23:48 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2012 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2013 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -64,6 +64,7 @@
 		
 		try {
 			Budget budget = null;
+			@SuppressWarnings("rawtypes")
 			java.util.List list = MM.sqlMap.queryForList("getAllBudgets", null);
 			
 			cmbBudget.removeAll();

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/ui/view/dialogs/DefaultAccountSelectorDialog.java'
--- infinitypfm/src/main/java/org/infinitypfm/ui/view/dialogs/DefaultAccountSelectorDialog.java	2012-08-26 22:11:17 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/ui/view/dialogs/DefaultAccountSelectorDialog.java	2014-11-27 22:23:48 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2011 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2013 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -15,13 +15,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with Infinity PFM.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ */
 
 package org.infinitypfm.ui.view.dialogs;
 
 import java.sql.SQLException;
 
-
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -33,45 +32,42 @@
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
 import org.infinitypfm.client.InfinityPfm;
-import org.infinitypfm.core.action.MainAction;
 import org.infinitypfm.core.conf.MM;
 import org.infinitypfm.core.data.Account;
-import org.infinitypfm.core.data.Budget;
-import org.infinitypfm.core.data.DataHandler;
-import org.infinitypfm.core.data.Transaction;
 
 public class DefaultAccountSelectorDialog extends BaseDialog {
 
+	@SuppressWarnings("rawtypes")
 	private java.util.List allActList = null;
 	private Tree tree = null;
 	private Button cmdSave = null;
 	private Button cmdCancel = null;
 
-	public DefaultAccountSelectorDialog(){
+	public DefaultAccountSelectorDialog() {
 		super();
-		
+
 		try {
 			allActList = MM.sqlMap.queryForList("getAccountTemplates", null);
-		} catch (SQLException se){
+		} catch (SQLException se) {
 			InfinityPfm.LogMessage(se.getMessage());
 		}
-	
+
 	}
-	
+
 	@Override
 	protected void LoadUI(Shell sh) {
-		
+
 		tree = new Tree(shell, SWT.BORDER | SWT.CHECK);
-		if (allActList != null){
-			
+		if (allActList != null) {
+
 			String oldAcctCategory = null;
 			Account account = null;
 			TreeItem categoryItem = null;
-			for (int i=0; i<allActList.size(); i++){
-				account = (Account)allActList.get(i);
-				if (!account.getActTypeName().equalsIgnoreCase(oldAcctCategory)){
-					
-					if (categoryItem != null){
+			for (int i = 0; i < allActList.size(); i++) {
+				account = (Account) allActList.get(i);
+				if (!account.getActTypeName().equalsIgnoreCase(oldAcctCategory)) {
+
+					if (categoryItem != null) {
 						categoryItem.setExpanded(true);
 					}
 					categoryItem = new TreeItem(tree, SWT.NONE);
@@ -79,55 +75,53 @@
 					categoryItem.setData(new Integer(account.getActTypeId()));
 					oldAcctCategory = account.getActTypeName();
 				}
-			
+
 				TreeItem accountItem = new TreeItem(categoryItem, SWT.NONE);
 				accountItem.setText(account.getActName());
-			
-				
+
 			}
-			//expand the last category
-			if (categoryItem != null){
+			// expand the last category
+			if (categoryItem != null) {
 				categoryItem.setExpanded(true);
 			}
 		}
-		
+
 		cmdSave = new Button(sh, SWT.PUSH);
 		cmdSave.setText(MM.PHRASES.getPhrase("14"));
 		cmdSave.addSelectionListener(cmdSave_OnClick);
 		cmdCancel = new Button(sh, SWT.PUSH);
 		cmdCancel.setText(MM.PHRASES.getPhrase("4"));
 		cmdCancel.addSelectionListener(cmdCancel_OnClick);
-		
+
 		tree.addSelectionListener(on_Click);
 	}
-	
+
 	@Override
 	protected void LoadLayout() {
-		
+
 		FormData treetdata = new FormData();
 		treetdata.top = new FormAttachment(0, 10);
 		treetdata.left = new FormAttachment(0, 10);
 		treetdata.right = new FormAttachment(100, -10);
 		treetdata.bottom = new FormAttachment(100, -40);
 		tree.setLayoutData(treetdata);
-		
+
 		FormData cmdcanceldata = new FormData();
 		cmdcanceldata.top = new FormAttachment(tree, 5);
 		cmdcanceldata.right = new FormAttachment(cmdSave, -10);
 		cmdCancel.setLayoutData(cmdcanceldata);
-		
+
 		FormData cmdsavedata = new FormData();
 		cmdsavedata.top = new FormAttachment(tree, 5);
 		cmdsavedata.right = new FormAttachment(100, -10);
 		cmdSave.setLayoutData(cmdsavedata);
 		cmdSave.setEnabled(false);
-		
+
 	}
 
 	public int Open() {
 		super.Open();
-		 shell.setText(MM.PHRASES.getPhrase("133") + " " +
-				MM.APPTITLE);
+		shell.setText(MM.PHRASES.getPhrase("133") + " " + MM.APPTITLE);
 
 		shell.setSize(300, 400);
 		this.CenterWindow();
@@ -142,93 +136,94 @@
 		return 1;
 	}
 
-	SelectionAdapter on_Click = new SelectionAdapter(){
-		public void widgetSelected(SelectionEvent e){
-			
-			TreeItem ti = (TreeItem)e.item;
+	SelectionAdapter on_Click = new SelectionAdapter() {
+		public void widgetSelected(SelectionEvent e) {
+
+			TreeItem ti = (TreeItem) e.item;
 			TreeItem parent = ti.getParentItem();
-			
-			if (parent == null){
+
+			if (parent == null) {
 				TreeItem[] items = ti.getItems();
-				for (int i=0; i<items.length; i++){
+				for (int i = 0; i < items.length; i++) {
 					TreeItem item = items[i];
 					item.setChecked(ti.getChecked());
 				}
-			} 
-			
-			if (ti.getChecked()){
-				
+			}
+
+			if (ti.getChecked()) {
+
 				cmdSave.setEnabled(true);
-				
+
 			}
-			
-	  }
+
+		}
 	};
-	
+
 	/*
 	 * Events
 	 */
-	
-	SelectionAdapter cmdCancel_OnClick = new SelectionAdapter(){
-		
+
+	SelectionAdapter cmdCancel_OnClick = new SelectionAdapter() {
+
 		public void widgetSelected(SelectionEvent event) {
 			shell.dispose();
 		}
 	};
-	
-	SelectionAdapter cmdSave_OnClick = new SelectionAdapter(){
-		
+
+	SelectionAdapter cmdSave_OnClick = new SelectionAdapter() {
+
 		public void widgetSelected(SelectionEvent event) {
-			//DataHandler data = new DataHandler();
 			InfinityPfm.qzMain.getStMain().setBusy(true);
-			InfinityPfm.qzMain.getStMain().setStatus(MM.PHRASES.getPhrase("89"));
-
-			
-			//confirm save
-			MessageDialog msg = new MessageDialog(MM.DIALOG_QUESTION, MM.APPTITLE,
-					MM.PHRASES.getPhrase("134"));
-			
+			InfinityPfm.qzMain.getStMain()
+					.setStatus(MM.PHRASES.getPhrase("89"));
+
+			// confirm save
+			MessageDialog msg = new MessageDialog(MM.DIALOG_QUESTION,
+					MM.APPTITLE, MM.PHRASES.getPhrase("134"));
+
 			int answer = msg.Open();
-			
+
 			if (answer == MM.YES) {
-				
+
 				TreeItem[] categories = tree.getItems();
 				Account account = null;
-				for (int i=0; i<categories.length; i++){
-				
+				for (int i = 0; i < categories.length; i++) {
+
 					TreeItem category = categories[i];
 					TreeItem[] items = category.getItems();
-					
-					for (int j=0; j<items.length; j++){
-					
+
+					for (int j = 0; j < items.length; j++) {
+
 						TreeItem ti = items[j];
-						if(ti.getChecked()){
+						if (ti.getChecked()) {
 							account = new Account();
 							account.setActName(ti.getText());
 							account.setActTypeName(ti.getParentItem().getText());
 							account.setActBalance(0);
-							Integer catId = (Integer)ti.getParentItem().getData();
+							Integer catId = (Integer) ti.getParentItem()
+									.getData();
 							account.setActTypeId(catId.intValue());
 							try {
 								MM.sqlMap.insert("insertAccount", account);
-							} catch (SQLException se){
+							} catch (SQLException se) {
 								InfinityPfm.LogMessage(se.getMessage());
 							}
-							
+
 						}
-						
+
 					}
 				}
 			}
 
-			InfinityPfm.qzMain.getStMain().setStatus(MM.PHRASES.getPhrase("87"));
+			InfinityPfm.qzMain.getStMain()
+					.setStatus(MM.PHRASES.getPhrase("87"));
 			InfinityPfm.qzMain.getStMain().setBusy(false);
 			InfinityPfm.qzMain.getTrMain().Reload();
-			
-			if (answer != MM.CANCEL){
+
+			if (answer != MM.CANCEL) {
 				shell.dispose();
 			}
-			
+
 		}
 	};
 }

=== modified file 'infinitypfm/src/main/java/org/infinitypfm/ui/view/dialogs/ImportDialog.java'
--- infinitypfm/src/main/java/org/infinitypfm/ui/view/dialogs/ImportDialog.java	2012-12-03 03:03:10 +0000
+++ infinitypfm/src/main/java/org/infinitypfm/ui/view/dialogs/ImportDialog.java	2014-11-27 22:23:48 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2012 Wayne Gray All rights reserved
+ * Copyright (c) 2005-2013 Wayne Gray All rights reserved
  * 
  * This file is part of Infinity PFM.
  * 
@@ -20,6 +20,7 @@
 package org.infinitypfm.ui.view.dialogs;
 
 import java.sql.SQLException;
+import java.util.List;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
@@ -49,13 +50,15 @@
 import org.infinitypfm.core.conf.MM;
 import org.infinitypfm.core.data.Account;
 import org.infinitypfm.core.data.AccountHash;
-import org.infinitypfm.core.data.Currency;
 import org.infinitypfm.core.data.DataHandler;
+import org.infinitypfm.core.data.ImportRule;
 import org.infinitypfm.core.data.Transaction;
 import org.infinitypfm.core.exception.TransactionException;
+import org.infinitypfm.core.types.AccountTypes;
+import org.infinitypfm.core.types.ImportRuleNames;
 
 /**
- * Main import dialog.  Handles all file types.
+ * Main import dialog. Handles all file types.
  * 
  * @author Wayne Gray
  * 
@@ -63,8 +66,7 @@
 public class ImportDialog extends BaseDialog {
 
 	private Combo cmbAct = null;
-	
-	
+
 	private Button cmdSave = null;
 	private Button cmdCancel = null;
 	private Table tblTrans = null;
@@ -77,21 +79,22 @@
 	private java.util.List<Account> allActList = null;
 	private AccountHash actHash = null;
 	private DataHandler data = new DataHandler();
-	
+
 	private String importCurrency = null;
+	private final int importAccount;
 
 	private static final int EDITABLECOLUMN = 2;
 	private static final String RATE_EDITOR = "rateEditor";
 	private static final String TRAN = "tran";
-	private static final String SPLIT = "**" + MM.PHRASES.getPhrase("235") + "**";
+	private static final String SPLIT = "**" + MM.PHRASES.getPhrase("235")
+			+ "**";
 
-	/**
-	 * 
-	 */
 	@SuppressWarnings("unchecked")
 	public ImportDialog() {
 		super();
 
+		importAccount = -1;
+
 		try {
 			allActList = MM.sqlMap.queryForList("getAllAccountsByType", null);
 		} catch (SQLException se) {
@@ -99,13 +102,12 @@
 		}
 	}
 
-	/**
-	 * 
-	 */
 	@SuppressWarnings("unchecked")
-	public ImportDialog(java.util.List<Transaction> tList) {
+	public ImportDialog(java.util.List<Transaction> tList, int importAcct) {
 		super();
+
 		tranList = tList;
+		importAccount = importAcct;
 
 		try {
 			allActList = MM.sqlMap.queryForList("getAllAccountsByType", null);
@@ -116,13 +118,6 @@
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * net.mogray.infinitypfm.ui.view.dialogs.BaseDialog#LoadUI(org.eclipse.
-	 * swt.widgets.Shell)
-	 */
 	protected void LoadUI(Shell sh) {
 
 		cmbAct = new Combo(sh, SWT.BORDER);
@@ -141,11 +136,10 @@
 		lblAlert = new Label(sh, SWT.BORDER);
 		lblAlert.setText(MM.PHRASES.getPhrase("135"));
 
-	
 		LoadAccountCombo();
 		LoadColumns();
 		LoadAccounts();
-		
+
 		editor = new TableEditor(tblTrans);
 		editor.horizontalAlignment = SWT.LEFT;
 		editor.grabHorizontal = true;
@@ -156,11 +150,6 @@
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see net.mogray.infinitypfm.ui.view.dialogs.BaseDialog#LoadLayout()
-	 */
 	protected void LoadLayout() {
 
 		FormData lblactdata = new FormData();
@@ -197,10 +186,6 @@
 		cmdSave.setLayoutData(cmdsavedata);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 */
 	public int Open() {
 		super.Open();
 		shell.setText(MM.PHRASES.getPhrase("18") + " " + MM.APPTITLE);
@@ -229,41 +214,122 @@
 
 		final Display display = InfinityPfm.shMain.getDisplay();
 
+		@SuppressWarnings("rawtypes")
+		List importRules = null;
+		ImportRule rule = null;
+		Account offset = null;
+
+		// Load all defined import rules
+		try {
+			importRules = MM.sqlMap.queryForList("getImportRules");
+		} catch (SQLException e1) {
+			InfinityPfm.LogMessage("Error loading import rules:  "
+					+ e1.getMessage());
+		}
+
 		if (tranList != null) {
 
 			for (int i = 0; i < tranList.size(); i++) {
 				tran = tranList.get(i);
 				ti = new TableItem(tblTrans, SWT.NONE);
 				ti.setText(0, tran.getTranDateFmt());
-				
-				if (tran.getTranMemo() != null){
+
+				if (tran.getTranMemo() != null) {
 					ti.setText(1, tran.getTranMemo());
 				}
 
 				try {
-					accountList = MM.sqlMap.queryForList("getAccountsForMemo",
-							tran);
-
-					if (accountList != null) {
-						if (accountList.size() > 0) {
-							account = accountList.get(0);
-							tran.setActOffset(account.getActId());
-							ti.setText(2, account.getActName());
-							ti.setText(4, account.getIsoCode());
-							
-						}
-					}
+
+					// Apply any import rules if defined
+					if (importRules != null && importRules.size() > 0) {
+
+						offset = null;
+
+						for (int j = 0; j < importRules.size(); j++) {
+
+							// See if any of the rules match the transaction
+							// Break out and use the mapped account on first one
+							// found
+							rule = (ImportRule) importRules.get(j);
+							if (rule != null) {
+
+								if (rule.getRuleName().equals(
+										ImportRuleNames.CONTAINS)) {
+
+									if (tran.getTranMemo().contains(
+											rule.getKeyword())) {
+										offset = new Account();
+										offset.setActId(rule.getActId());
+										break;
+									}
+
+								} else if (rule.getRuleName().equals(
+										ImportRuleNames.STARTSWITH)) {
+
+									if (tran.getTranMemo().startsWith(
+											rule.getKeyword())) {
+										offset = new Account();
+										offset.setActId(rule.getActId());
+										break;
+									}
+
+								} else if (rule.getRuleName().equals(
+										ImportRuleNames.ENDSWITH)) {
+
+									if (tran.getTranMemo().endsWith(
+											rule.getKeyword())) {
+										offset = new Account();
+										offset.setActId(rule.getActId());
+										break;
+									}
+								}
+							}
+						}
+					}
+
+					if (offset != null) {
+
+						// Found a rule match. Add mapped offset to the
+						// transactions
+						offset = (Account) MM.sqlMap.queryForObject(
+								"getAccountByActId", offset);
+						if (offset != null) {
+							tran.setActOffset(offset.getActId());
+							ti.setText(2, offset.getActName());
+							ti.setText(4, offset.getIsoCode());
+						} else {
+							// This should never happen
+							InfinityPfm.LogMessage(MM.PHRASES.getPhrase("246"));
+						}
+
+					} else {
+
+						// Try to use last saved offset for this transactions
+						accountList = MM.sqlMap.queryForList(
+								"getAccountsForMemo", tran);
+
+						if (accountList != null) {
+							if (accountList.size() > 0) {
+								account = accountList.get(0);
+								tran.setActOffset(account.getActId());
+								ti.setText(2, account.getActName());
+								ti.setText(4, account.getIsoCode());
+
+							}
+						}
+					}
+
 				} catch (SQLException e) {
 					InfinityPfm.LogMessage(e.getMessage());
 				}
-				
+
 				ti.setData(TRAN, tran);
 				ti.setText(3,
 						formatter.getAmountFormatted(tran.getTranAmount()));
-				
+
 				rateEditor = new TableEditor(tblTrans);
 				Text txtRate = new Text(tblTrans, SWT.CENTER);
-				txtRate.addFocusListener(ratebox_lostFocus );
+				txtRate.addFocusListener(ratebox_lostFocus);
 				txtRate.setData(Integer.toString(i));
 				txtRate.pack();
 				rateEditor.grabHorizontal = true;
@@ -271,13 +337,14 @@
 				rateEditor.horizontalAlignment = SWT.CENTER;
 				rateEditor.setEditor(txtRate, ti, 5);
 				ti.setData(RATE_EDITOR, rateEditor);
-				
+
 				setRate(account, actHash.get(cmbAct.getText()), txtRate, tran);
 
 				if (i % 2D == 0) {
-					
-					Color altRowColor = display.getSystemColor(MM.ROW_BACKGROUND);
-					
+
+					Color altRowColor = display
+							.getSystemColor(MM.ROW_BACKGROUND);
+
 					ti.setBackground(0, altRowColor);
 					ti.setBackground(1, altRowColor);
 					ti.setBackground(2, altRowColor);
@@ -323,7 +390,7 @@
 		try {
 			Account act = null;
 			java.util.List<Account> list = MM.sqlMap.queryForList(
-					"getAccountsForType", "Bank");
+					"getAccountsForType", AccountTypes.BANK);
 
 			if (list.size() == 0) {
 				lblAlert.setText(MM.PHRASES.getPhrase("64"));
@@ -332,18 +399,22 @@
 
 			cmbAct.removeAll();
 
+			int showIndex = 0;
+
 			for (int i = 0; i < list.size(); i++) {
 				act = list.get(i);
 				cmbAct.add(act.getActName());
-				
-				if (i==0){
+
+				if (act.getActId() == importAccount) {
+					showIndex = i;
 					importCurrency = act.getIsoCode();
-					lblAct.setText(MM.PHRASES.getPhrase("15") + " (" + importCurrency + ")");
+					lblAct.setText(MM.PHRASES.getPhrase("15") + " ("
+							+ importCurrency + ")");
 				}
 
 			}
 
-			cmbAct.select(0);
+			cmbAct.select(showIndex);
 
 		} catch (SQLException se) {
 			InfinityPfm.LogMessage(se.getMessage());
@@ -358,20 +429,20 @@
 		Button cmdSplit = new Button(cellEditor, SWT.PUSH);
 		cmdSplit.setText("...");
 		cmdSplit.setToolTipText(MM.PHRASES.getPhrase("233"));
-		
+
 		FormData cmboffsetdata = new FormData();
 		cmboffsetdata.top = new FormAttachment(0, 0);
 		cmboffsetdata.left = new FormAttachment(0, 0);
 		cmboffsetdata.right = new FormAttachment(100, -23);
 		cmbOffset.setLayoutData(cmboffsetdata);
-		
+
 		FormData cmdsplitdata = new FormData();
 		cmdsplitdata.top = new FormAttachment(0, 0);
 		cmdsplitdata.left = new FormAttachment(cmbOffset, 0);
 		cmdSplit.setLayoutData(cmdsplitdata);
-		
+
 		Account act = null;
-		
+
 		if (allActList == null) {
 			lblAlert.setText(MM.PHRASES.getPhrase("64"));
 			return null;
@@ -381,49 +452,47 @@
 			act = allActList.get(i);
 			cmbOffset.add(act.getActName());
 		}
-		
+
 		cmbOffset.add(SPLIT);
-		
-		//cmbOffset.addVerifyListener(cmbEditor_onVerify);
 
 		cellEditor.pack();
 		return cellEditor;
 
 	}
-	
-	private void setRate(Account offsetAccount, Account importAccount, Text rateBox, Transaction tran){
-		
-		Currency currency = null;
-		
-		if (offsetAccount == null || importAccount == null){
+
+	private void setRate(Account offsetAccount, Account importAccount,
+			Text rateBox, Transaction tran) {
+
+		if (offsetAccount == null || importAccount == null) {
 			rateBox.setEnabled(false);
 			tran.setExchangeRate("1");
 			return;
 		}
-		
-		if (!offsetAccount.getIsoCode().equalsIgnoreCase(importCurrency)){						
+
+		if (!offsetAccount.getIsoCode().equalsIgnoreCase(importCurrency)) {
 			rateBox.setEnabled(true);
-			
-			if (rateBox.getText().length()==0){
+
+			if (rateBox.getText().length() == 0) {
 				try {
-					
-					String rate = data.getExchangeRate(importAccount, offsetAccount);
+
+					String rate = data.getExchangeRate(importAccount,
+							offsetAccount);
 					tran.setExchangeRate(rate);
 					rateBox.setText(rate);
-					
+
 				} catch (SQLException e) {
 					InfinityPfm.LogMessage(e.getMessage());
 				}
-				
+
 			}
-			
+
 		} else {
 			rateBox.setText("");
 			rateBox.setEnabled(false);
 			tran.setExchangeRate("1");
-			
+
 		}
-		
+
 	}
 
 	/*
@@ -435,12 +504,12 @@
 		public void widgetSelected(SelectionEvent event) {
 			shell.dispose();
 		}
-	};	
+	};
 
 	SelectionAdapter cmdSave_OnClick = new SelectionAdapter() {
 
 		public void widgetSelected(SelectionEvent event) {
-			
+
 			InfinityPfm.qzMain.getStMain().setBusy(true);
 			InfinityPfm.qzMain.getStMain()
 					.setStatus(MM.PHRASES.getPhrase("89"));
@@ -488,7 +557,6 @@
 	SelectionAdapter tblTrans_OnClick = new SelectionAdapter() {
 		public void widgetSelected(SelectionEvent event) {
 
-
 			// Clean up any previous editor control
 			Control oldEditor = editor.getEditor();
 			if (oldEditor != null)
@@ -501,19 +569,18 @@
 
 			// The control that will be the editor must be a child of the Table
 			Composite newEditor = getEditor();
-			
 
 			Control[] childList = newEditor.getChildren();
-			for (Control child : childList){
-				if (child instanceof CCombo ){
-					
-					((CCombo)child).addSelectionListener(rowCombo_OnClick);
-					
-				} else if (child instanceof Button){
-					((Button)child).addSelectionListener(rowButton_OnClick);
+			for (Control child : childList) {
+				if (child instanceof CCombo) {
+
+					((CCombo) child).addSelectionListener(rowCombo_OnClick);
+
+				} else if (child instanceof Button) {
+					((Button) child).addSelectionListener(rowButton_OnClick);
 				}
 			}
-			
+
 			cmdSave.setEnabled(true);
 
 			if (newEditor != null) {
@@ -535,17 +602,17 @@
 
 		}
 	};
-	
-SelectionAdapter rowCombo_OnClick = new SelectionAdapter(){
-		
+
+	SelectionAdapter rowCombo_OnClick = new SelectionAdapter() {
+
 		public void widgetSelected(SelectionEvent event) {
-			
+
 			Composite c = (Composite) editor.getEditor();
 
-			for (Control child : c.getChildren()){
-				if (child instanceof CCombo ){
-				
-					CCombo combo = (CCombo)child;
+			for (Control child : c.getChildren()) {
+				if (child instanceof CCombo) {
+
+					CCombo combo = (CCombo) child;
 					String sAct = combo.getText();
 					Account act = null;
 					Account importAct = null;
@@ -555,68 +622,72 @@
 					if (sAct != null && !sAct.equals(SPLIT)) {
 						editor.getItem().setText(EDITABLECOLUMN, sAct);
 						tran = (Transaction) editor.getItem().getData(TRAN);
-						rateBox = (Text)((TableEditor)(editor.getItem().getData(RATE_EDITOR))).getEditor();
+						rateBox = (Text) ((TableEditor) (editor.getItem()
+								.getData(RATE_EDITOR))).getEditor();
 						act = (Account) actHash.get(sAct);
 
-						importAct = (Account)actHash.get(cmbAct.getText());
-						
+						importAct = (Account) actHash.get(cmbAct.getText());
+
 						if (act != null) {
 							tran.setActOffset(act.getActId());
 						} else {
 							rateBox.setEnabled(false);
 						}
-						
+
 						setRate(act, importAct, rateBox, tran);
-						
+
 						editor.getItem().setText(4, act.getIsoCode());
-						
-					} else if (sAct.equals(SPLIT)){
-						editor.getItem().setText(EDITABLECOLUMN, SPLIT);
-					}
-				}
-			}
-		}
-};
-
-SelectionAdapter rowButton_OnClick = new SelectionAdapter(){
-	
-	public void widgetSelected(SelectionEvent event) {
-	
-		Composite c = (Composite) editor.getEditor();
-		
-		Account importAct = (Account)actHash.get(cmbAct.getText());
-		Transaction savedTran = (Transaction) editor.getItem().getData(TRAN);
-		
-		TransactionDialog dialog = new TransactionDialog(importAct, savedTran);
-		dialog.setTransactionMode(MM.TRANSACTION_MODE_NOCOMMIT);
-		dialog.Open();
-		Transaction tran = dialog.getTransaction();
-		
-		if (tran != null){
-			
-			savedTran.setOffsets(tran.getOffsets());
-			
-			for (Control child : c.getChildren()){
-				if (child instanceof CCombo ){
-					CCombo combo = (CCombo)child;
-					
-					if (tran.getOffsets() != null && tran.getOffsets().size() > 1){
-						editor.getItem().setText(EDITABLECOLUMN, SPLIT);
-						combo.setText(SPLIT);
-					} else if (tran.getOffsets().size() == 1) {
-						editor.getItem().setText(tran.getActOffsetName());
-						combo.setText(tran.getActOffsetName());
-					}
-				}
-			}
-		}
-	}
-};
-	
-	SelectionAdapter cmbAccount_OnClick = new SelectionAdapter(){
-		
-		public void widgetSelected(SelectionEvent event) {
-			
+
+					} else if (sAct.equals(SPLIT)) {
+						editor.getItem().setText(EDITABLECOLUMN, SPLIT);
+					}
+				}
+			}
+		}
+	};
+
+	SelectionAdapter rowButton_OnClick = new SelectionAdapter() {
+
+		public void widgetSelected(SelectionEvent event) {
+
+			Composite c = (Composite) editor.getEditor();
+
+			Account importAct = (Account) actHash.get(cmbAct.getText());
+			Transaction savedTran = (Transaction) editor.getItem()
+					.getData(TRAN);
+
+			TransactionDialog dialog = new TransactionDialog(importAct,
+					savedTran);
+			dialog.setTransactionMode(MM.TRANSACTION_MODE_NOCOMMIT);
+			dialog.Open();
+			Transaction tran = dialog.getTransaction();
+
+			if (tran != null) {
+
+				savedTran.setOffsets(tran.getOffsets());
+
+				for (Control child : c.getChildren()) {
+					if (child instanceof CCombo) {
+						CCombo combo = (CCombo) child;
+
+						if (tran.getOffsets() != null
+								&& tran.getOffsets().size() > 1) {
+							editor.getItem().setText(EDITABLECOLUMN, SPLIT);
+							combo.setText(SPLIT);
+						} else if (tran.getOffsets().size() == 1) {
+							editor.getItem().setText(tran.getActOffsetName());
+							combo.setText(tran.getActOffsetName());
+						}
+					}
+				}
+			}
+		}
+	};
+
+	SelectionAdapter cmbAccount_OnClick = new SelectionAdapter() {
+
+		public void widgetSelected(SelectionEvent event) {
+
 			TableItem[] rows = tblTrans.getItems();
 			TableItem row = null;
 			TableEditor editor = null;
@@ -624,48 +695,49 @@
 			String act = null;
 			Text txtRate = null;
 			Transaction tran = null;
-			
+
 			Account importAccount = actHash.get(cmbAct.getText());
 			importCurrency = importAccount.getIsoCode();
-			
-			for (int i=0; i<rows.length; i++){
+
+			for (int i = 0; i < rows.length; i++) {
 				row = rows[i];
-				editor = (TableEditor)row.getData(RATE_EDITOR);
-				tran = (Transaction)row.getData(TRAN);
+				editor = (TableEditor) row.getData(RATE_EDITOR);
+				tran = (Transaction) row.getData(TRAN);
 				act = row.getText(2);
-				
-				if (act != null){
+
+				if (act != null) {
 					offset = actHash.get(act);
-					txtRate = (Text)editor.getEditor();
-					
+					txtRate = (Text) editor.getEditor();
+
 					setRate(offset, importAccount, txtRate, tran);
-										
+
 				} else {
 					txtRate.setEnabled(true);
 				}
-				
+
 			}
-			
-			lblAct.setText(MM.PHRASES.getPhrase("15") + " (" + importCurrency + ")");
+
+			lblAct.setText(MM.PHRASES.getPhrase("15") + " (" + importCurrency
+					+ ")");
 		}
 	};
-	
-	FocusAdapter ratebox_lostFocus = new FocusAdapter(){
+
+	FocusAdapter ratebox_lostFocus = new FocusAdapter() {
 
 		@Override
 		public void focusLost(FocusEvent event) {
-			
-			Text ratebox = (Text)event.widget;
-			int row = Integer.parseInt((String)ratebox.getData());
-			Table tbl = (Table)ratebox.getParent();
+
+			Text ratebox = (Text) event.widget;
+			int row = Integer.parseInt((String) ratebox.getData());
+			Table tbl = (Table) ratebox.getParent();
 			TableItem[] items = tbl.getItems();
-			Transaction tran = (Transaction)items[row].getData(TRAN);
+			Transaction tran = (Transaction) items[row].getData(TRAN);
 			tran.setExchangeRate(ratebox.getText());
-			
+
 			super.focusLost(event);
-			
+
 		}
-		
+
 	};
 
 }

=== added file 'infinitypfm/src/main/java/org/infinitypfm/ui/view/dialogs/ImportRulesDialog.java'
--- infinitypfm/src/main/java/org/infinitypfm/ui/view/dialogs/ImportRulesDialog.java	1970-01-01 00:00:00 +0000