Updated extension MD2023: StringUtils, NPE errors, Fixes for Mac and …

…FileDialog etc...
stant · Apr 4, 2023 · 8bd55fc · 8bd55fc
1 parent 54a0e95
commit 8bd55fc
Show file tree

Hide file tree

Showing 39 changed files with 660 additions and 560 deletions.
diff --git a/build.xml b/build.xml
@@ -77,6 +77,7 @@
         <property name="privatekey" value="private.key"/>
         <property name="publickey" value="public.key"/>
         <property name="privatekeyid" value="99"/>
+        <property name="keypass" value=""/>
     </target>
 
     <target name="-post-jar">
@@ -92,6 +93,7 @@
       <java newenvironment="true"
             classpath="externals/moneydance/extadmin.jar:externals/moneydance/moneydance.jar"
             classname="com.moneydance.admin.KeyAdmin">
+            <sysproperty key="moneydance_key_pass" value="${keypass}"/>
             <arg value="signextjar"/>
             <arg value="${privatekey}"/>
             <arg value="${privatekeyid}"/>
@@ -111,6 +113,7 @@
 
     <target name="genkeys" depends="init">
         <java
+            fork="true"
             classpath="externals/moneydance/extadmin.jar"
             classname="com.moneydance.admin.KeyAdmin">
             <arg value="genkey"/>

diff --git a/build/built-jar.properties b/build/built-jar.properties
@@ -1,4 +1,4 @@
-#Sun, 20 Mar 2016 22:38:40 -0400
+#Tue, 04 Apr 2023 14:30:20 +0100
 
 
-F\:\\github\\mdcsvimporter2015=
+/Users/stu/Documents/Moneydance/mdcsvimporter2015=
diff --git a/...ses/com/moneydance/modules/features/mdcsvimporter/formats/BbvaCompassBankReader.java-HIDE b/...ses/com/moneydance/modules/features/mdcsvimporter/formats/BbvaCompassBankReader.java-HIDE
@@ -19,7 +19,7 @@ import com.moneydance.modules.features.mdcsvimporter.CSVData;
 import com.moneydance.modules.features.mdcsvimporter.DateGuesser;
 import com.moneydance.modules.features.mdcsvimporter.TransactionReader;
 import com.moneydance.util.CustomDateFormat;
-import com.moneydance.util.StringUtils;
+import com.infinitekind.util.StringUtils;
 import java.io.IOException;
 
 /**

diff --git a/...sses/com/moneydance/modules/features/mdcsvimporter/formats/CitiBankCanadaReader.java-HIDE b/...sses/com/moneydance/modules/features/mdcsvimporter/formats/CitiBankCanadaReader.java-HIDE
@@ -18,7 +18,7 @@ import com.moneydance.modules.features.mdcsvimporter.TransactionReader;
 import com.moneydance.apps.md.model.OnlineTxn;
 import com.moneydance.modules.features.mdcsvimporter.CSVData;
 import com.moneydance.util.CustomDateFormat;
-import com.moneydance.util.StringUtils;
+import com.infinitekind.util.StringUtils;
 import java.io.IOException;
 
 public class CitiBankCanadaReader

diff --git a/...sses/com/moneydance/modules/features/mdcsvimporter/formats/INGNetherlandsReader.java-HIDE b/...sses/com/moneydance/modules/features/mdcsvimporter/formats/INGNetherlandsReader.java-HIDE
@@ -18,7 +18,7 @@ import com.moneydance.modules.features.mdcsvimporter.TransactionReader;
 import com.moneydance.apps.md.model.OnlineTxn;
 import com.moneydance.modules.features.mdcsvimporter.CSVData;
 import com.moneydance.util.CustomDateFormat;
-import com.moneydance.util.StringUtils;
+import com.infinitekind.util.StringUtils;
 import java.io.IOException;
 
 public class INGNetherlandsReader

diff --git a/...s/com/moneydance/modules/features/mdcsvimporter/formats/SimpleCreditDebitReader.java-HIDE b/...s/com/moneydance/modules/features/mdcsvimporter/formats/SimpleCreditDebitReader.java-HIDE
@@ -19,7 +19,7 @@ import com.moneydance.modules.features.mdcsvimporter.CSVData;
 import com.moneydance.modules.features.mdcsvimporter.DateGuesser;
 import com.moneydance.modules.features.mdcsvimporter.TransactionReader;
 import com.moneydance.util.CustomDateFormat;
-import com.moneydance.util.StringUtils;
+import com.infinitekind.util.StringUtils;
 import java.io.IOException;
 
 /**

diff --git a/.../classes/com/moneydance/modules/features/mdcsvimporter/formats/WellsFargoReader.java-HIDE b/.../classes/com/moneydance/modules/features/mdcsvimporter/formats/WellsFargoReader.java-HIDE
@@ -18,7 +18,7 @@ import com.moneydance.apps.md.model.OnlineTxn;
 import com.moneydance.modules.features.mdcsvimporter.CSVData;
 import com.moneydance.modules.features.mdcsvimporter.TransactionReader;
 import com.moneydance.util.CustomDateFormat;
-import com.moneydance.util.StringUtils;
+import com.infinitekind.util.StringUtils;
 import java.io.IOException;
 
 /**

diff --git a/build/classes/com/moneydance/modules/features/mdcsvimporter/formats/YodleeReader.java-HIDE b/build/classes/com/moneydance/modules/features/mdcsvimporter/formats/YodleeReader.java-HIDE
@@ -18,7 +18,7 @@ import com.moneydance.apps.md.model.OnlineTxn;
 import com.moneydance.modules.features.mdcsvimporter.CSVData;
 import com.moneydance.modules.features.mdcsvimporter.TransactionReader;
 import com.moneydance.util.CustomDateFormat;
-import com.moneydance.util.StringUtils;
+import com.infinitekind.util.StringUtils;
 import java.io.IOException;
 
 /*
@@ -237,7 +237,7 @@ public class YodleeReader
 	}
 
 	public void createSupportedDateFormats(String dateFormatArg) {
-		System.err.println("\n---------   entered createSupportedDateFormats() dateFormatArg =" + dateFormatArg + "=  -------------");
+		Util.logConsole("\n---------   entered createSupportedDateFormats() dateFormatArg =" + dateFormatArg + "=  -------------");
 		String[] tmp = new String[1];
 		tmp[0] = dateFormatArg;
 		SUPPORTED_DATE_FORMATS = tmp;
@@ -261,7 +261,7 @@ public class YodleeReader
 			return;
 		}
 
-		System.err.println("setDateFormat() format =" + format + "=   dateFormatString =" + dateFormatString + "=");
+		Util.logConsole("setDateFormat() format =" + format + "=   dateFormatString =" + dateFormatString + "=");
 		if (!format.equals(dateFormatStringSelected)) {
 			dateFormat = new CustomDateFormat(format);
 			dateFormatStringSelected = format;

diff --git a/dist/lib/extadmin.jar b/dist/lib/extadmin.jar
diff --git a/dist/mdcsvimporter.mxt b/dist/mdcsvimporter.mxt
diff --git a/dist/mdcsvimporter.zip b/dist/mdcsvimporter.zip
diff --git a/externals/moneydance/extadmin.jar b/externals/moneydance/extadmin.jar
diff --git a/nbproject/project.properties b/nbproject/project.properties
@@ -53,6 +53,7 @@ javac.processorpath=\
     ${javac.classpath}
 javac.source=11
 javac.target=11
+javac.fork=true
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\

diff --git a/private.key b/private.key
diff --git a/public.key b/public.key
diff --git a/src/com/moneydance/modules/features/mdcsvimporter/CSVData.java b/src/com/moneydance/modules/features/mdcsvimporter/CSVData.java
@@ -69,11 +69,11 @@ public void parseIntoLines( CustomReaderData customReaderData )
         {
          for ( String s = reader.nextField(); s != null; s = reader.nextField() )
             {
-            //System.err.println( "         line.add string =" + s + "=" );
+            //Util.logConsole( "         line.add string =" + s + "=" );
             line.add( s );
             }
 
-         System.err.println( "         line.size() =" + line.size() + "=\n" );
+         Util.logConsole( "         line.size() =" + line.size() + "=\n" );
          if ( line.size() > maxFoundCols )
             {
             maxFoundCols = line.size();
@@ -86,44 +86,44 @@ public void parseIntoLines( CustomReaderData customReaderData )
 
       data = new String[file.size()][];
       file.toArray( data );
-      System.err.println( "    parsed lines total =" + file.size() + "=   maxFoundCols =" + maxFoundCols );
+      Util.logConsole( "    parsed lines total =" + file.size() + "=   maxFoundCols =" + maxFoundCols );
       currentLineIndex = -1;
       currentFieldIndex = -1;      
 
       int maxr = file.size();
       dataErr = new String[maxr][];
-      //System.err.println( " reset maxr =" + maxr );
+      //Util.logConsole( " reset maxr =" + maxr );
       for ( int r = 0; r < maxr; r++ )
       {
           int maxc = maxFoundCols + 1;
           String[] newLine = new String[ maxFoundCols + 1 ];
           for ( int c = 0; c < maxc; c++ )
               {
-              //System.err.println( " reset r =" + r + "   c =" + c );
+              //Util.logConsole( " reset r =" + r + "   c =" + c );
               newLine[c] = "";
               }
           dataErr[r] = newLine;
       }
 
-//      System.err.println( "PRINT OUT RESET dataErr" );
+//      Util.logConsole( "PRINT OUT RESET dataErr" );
 //      maxr = dataErr.length;
-//      System.err.println( " reset maxr =" + maxr );
+//      Util.logConsole( " reset maxr =" + maxr );
 //      for ( int r = 0; r < maxr; r++ )
 //      {
 //          int maxc = dataErr[r].length;
-//          System.err.println( " reset maxc =" + maxc );
+//          Util.logConsole( " reset maxc =" + maxc );
 //          for ( int c = 0; c < maxc; c++ )
 //              {
-//              System.err.println( "dataErr blank [" + r + "][" + c +"] =" + dataErr[r][c] );
+//              Util.logConsole( "dataErr blank [" + r + "][" + c +"] =" + dataErr[r][c] );
 //              }
 //      }
    }
 
    public void reverseListRangeOrder( long beg, long end )
         {
-        //System.err.println(  "hasZeroFields() ----  currentLineIndex =" + currentLineIndex + "=    data.length =" + data.length );
-        System.err.println( "revLine beg: " +  beg );
-        System.err.println( "revLine end: " +  end );
+        //Util.logConsole(  "hasZeroFields() ----  currentLineIndex =" + currentLineIndex + "=    data.length =" + data.length );
+        Util.logConsole( "revLine beg: " +  beg );
+        Util.logConsole( "revLine end: " +  end );
         if ( end <= beg )
             {
             return;
@@ -150,22 +150,22 @@ public boolean nextLine()
          currentFieldIndex = -1;
       }
 
-      //System.err.println(  "nextLine() ----  currentLineIndex =" + currentLineIndex + "=    data.length =" + data.length + "   ans =" + (currentLineIndex < data.length ? "true" : "false" ) );
+      //Util.logConsole(  "nextLine() ----  currentLineIndex =" + currentLineIndex + "=    data.length =" + data.length + "   ans =" + (currentLineIndex < data.length ? "true" : "false" ) );
       return currentLineIndex < data.length;
    }
 
    public boolean hasEnoughFieldsPerCurrentLine( int neededFields )
    {
-      System.err.println(  "fieldsPerCurrentLine()   data[currentLineIndex].length + 1 =" + (data[currentLineIndex].length + 1) + " >= neededFields =" + neededFields );
+      Util.logConsole(  "fieldsPerCurrentLine()   data[currentLineIndex].length + 1 =" + (data[currentLineIndex].length + 1) + " >= neededFields =" + neededFields );
       return data[currentLineIndex].length + 1 >= neededFields;
    }
 
    public boolean nextField()
    {
-      //System.err.println(  "nextField() ----  currentLineIndex =" + currentLineIndex + "=    data.length =" + data.length );
+      //Util.logConsole(  "nextField() ----  currentLineIndex =" + currentLineIndex + "=    data.length =" + data.length );
       if ( currentLineIndex < 0 || currentLineIndex >= data.length )
       {
-      //System.err.println(  "nextField() ----  return false" );
+      //Util.logConsole(  "nextField() ----  return false" );
          return false;
       }
 
@@ -174,20 +174,20 @@ public boolean nextField()
          ++currentFieldIndex;
       }
 
-      //System.err.println(  "nextField()2 ----  currentLineIndex =" + currentLineIndex + "=    data.length =" + data.length + "   ans =" + (currentFieldIndex < data[currentLineIndex].length ? "true" : "false" ) );
+      //Util.logConsole(  "nextField()2 ----  currentLineIndex =" + currentLineIndex + "=    data.length =" + data.length + "   ans =" + (currentFieldIndex < data[currentLineIndex].length ? "true" : "false" ) );
       return currentFieldIndex < data[currentLineIndex].length;
    }
 
    public boolean hasZeroFields()
    {
-      //System.err.println(  "hasZeroFields() ----  currentLineIndex =" + currentLineIndex + "=    data.length =" + data.length );
+      //Util.logConsole(  "hasZeroFields() ----  currentLineIndex =" + currentLineIndex + "=    data.length =" + data.length );
       if ( currentLineIndex < 0 || currentLineIndex >= data.length )
       {
-      //System.err.println(  "hasZeroFields() ----  return false" );
+      //Util.logConsole(  "hasZeroFields() ----  return false" );
          return false;
       }
 
-      //System.err.println(  "hasZeroFields()2 ----  currentLineIndex =" + currentLineIndex + "=    data.length =" + data.length + "   ans =" + (0 < data[currentLineIndex].length ? "true" : "false" ) );
+      //Util.logConsole(  "hasZeroFields()2 ----  currentLineIndex =" + currentLineIndex + "=    data.length =" + data.length + "   ans =" + (0 < data[currentLineIndex].length ? "true" : "false" ) );
       return 0 < data[currentLineIndex].length;
    }
 
@@ -207,7 +207,7 @@ public String getField()
 
    public String getFieldErr()
    {
-    //System.err.println( "getFieldErr current ptr [" + currentLineIndex + "][" + currentFieldIndex + "]" );
+    //Util.logConsole( "getFieldErr current ptr [" + currentLineIndex + "][" + currentFieldIndex + "]" );
       if ( currentLineIndex < 0 || currentLineIndex >= dataErr.length )
       {
          return "";
@@ -222,7 +222,7 @@ public String getFieldErr()
 
    public void setFieldErr( String errStr )
    {
-    //System.err.println( "setFieldErr current ptr [" + currentLineIndex + "][" + currentFieldIndex + "]" );
+    //Util.logConsole( "setFieldErr current ptr [" + currentLineIndex + "][" + currentFieldIndex + "]" );
       if ( currentLineIndex < 0 || currentLineIndex >= dataErr.length )
       {
          return;
@@ -237,7 +237,7 @@ public void setFieldErr( String errStr )
 
    public String getFieldErr( int row, int col )
    {
-    //System.err.println( "getFieldErr [" + row + "][" + col + "]" );
+    //Util.logConsole( "getFieldErr [" + row + "][" + col + "]" );
       if ( row < 0 || row >= dataErr.length )
       {
          return "";
@@ -252,7 +252,7 @@ public String getFieldErr( int row, int col )
 
    public void setFieldErr( int row, int col, String errStr )
    {
-    //System.err.println( "setFieldErr [" + row + "][" + col + "]" );
+    //Util.logConsole( "setFieldErr [" + row + "][" + col + "]" );
       if ( row < 0 || row >= dataErr.length )
       {
           return;
@@ -305,43 +305,43 @@ public String printCurrentLine()
    {
       if ( currentLineIndex < 0 || currentLineIndex >= data.length )
           {
-          System.err.append( "currentLineIndex out of range =" + currentLineIndex );
+          Util.logConsoleAppend( "currentLineIndex out of range =" + currentLineIndex );
           return "";
           }
 
-      System.err.append( "\n curr line >" );
+      Util.logConsoleAppend( "\n curr line >" );
       try {
        for ( int i = 0; i < data[currentLineIndex].length; i ++ )
            {
            if ( i > 0 )
-                System.err.append( "|" );
-           System.err.append( data[currentLineIndex][currentFieldIndex] );
+                Util.logConsoleAppend( "|" );
+           Util.logConsoleAppend( data[currentLineIndex][currentFieldIndex] );
            }
         }
       catch( Exception ex )
         {
-        System.err.append( "*** Error in printCurrentLine at currentLineIndex =" + currentLineIndex + "   currentFieldIndex =" + currentFieldIndex );
+        Util.logConsoleAppend( "*** Error in printCurrentLine at currentLineIndex =" + currentLineIndex + "   currentFieldIndex =" + currentFieldIndex );
         }
-       System.err.append( "< curr line." );
+       Util.logConsoleAppend( "< curr line." );
        return "";
    }
 
    public void printFile()
     {
-    System.err.append( "\n ------------- PRINT FILE  ---------------" );
+    Util.logConsoleAppend( "\n ------------- PRINT FILE  ---------------" );
     int maxRows = data.length;
     for ( int row = 0; row < maxRows; row++ )
         {
-        System.err.append( "\n line [" +  row + "] >" );
+        Util.logConsoleAppend( "\n line [" +  row + "] >" );
         for ( int fieldIndex = 0; fieldIndex < data[ row ].length; fieldIndex++ )
             {
             if ( fieldIndex > 0 )
-                    System.err.append( "|" );
-            System.err.append( data[ row ][ fieldIndex ] );
+                    Util.logConsoleAppend( "|" );
+            Util.logConsoleAppend( data[ row ][ fieldIndex ] );
             }
-        System.err.append( "<" );
+        Util.logConsoleAppend( "<" );
         }
-    System.err.append( "\n -------------  END PRINT FILE  ---------------" );
+    Util.logConsoleAppend( "\n -------------  END PRINT FILE  ---------------" );
     }
 
     public CSVReader getReader() {

diff --git a/src/com/moneydance/modules/features/mdcsvimporter/CSVReader.java b/src/com/moneydance/modules/features/mdcsvimporter/CSVReader.java
@@ -201,11 +201,11 @@ public boolean nextLine()
    public String nextField()
       throws IOException
    {
-      //System.err.println( "nextField() fieldSeparator =" + (char)fieldSeparator + "=" );
+      //Util.logConsole( "nextField() fieldSeparator =" + (char)fieldSeparator + "=" );
 
       if ( isEol( lastChar ) || isEof( lastChar ) )
       {
-         //System.err.println( "nextField() return null for Eol or Eof" );
+         //Util.logConsole( "nextField() return null for Eol or Eof" );
          return null;
       }
 
@@ -219,10 +219,10 @@ public String nextField()
          {
             builder.appendCodePoint( lastChar );
             lastChar = reader.read();
-            //System.err.println( "lastChar =" + lastChar + "=" );
+            //Util.logConsole( "lastChar =" + lastChar + "=" );
          }
-         //System.err.println( "end field" );
-         //System.err.println( "read field =" + builder.toString() + "=" );
+         //Util.logConsole( "end field" );
+         //Util.logConsole( "read field =" + builder.toString() + "=" );
 
          if ( !isQuote( lastChar ) )
          {
@@ -261,19 +261,19 @@ public String nextField()
 
       if ( trimFields )
       {
-         //System.err.println( "CSVReader return nextField trim =" + builder.toString().trim() + "=" );
+         //Util.logConsole( "CSVReader return nextField trim =" + builder.toString().trim() + "=" );
          return builder.toString().trim();
       }
       else
       {
-         //System.err.println( "CSVReader return nextField =" + builder.toString() + "=" );
+         //Util.logConsole( "CSVReader return nextField =" + builder.toString() + "=" );
          return builder.toString();
       }
    }
 
    public void setFieldSeparator( int fieldSeparator )
    {
-      //System.err.println( "CSVReader.setFieldSeparator =" + (char)fieldSeparator + "=" );
+      //Util.logConsole( "CSVReader.setFieldSeparator =" + (char)fieldSeparator + "=" );
       this.fieldSeparator = fieldSeparator;
    }