Support for Multiple Parsers completed.

* kpdfsync version changed to 0.10.0.
* Readme updated with new screenshot.
* BugFix: Open Clippings file button was disabled before Parser
  selection.
* AbstractKindleParserConstants, ParserResultFieldsFilter classes
  removed. These classes complicated the parser implementation,
  and added little benefit. For now V2 Parser overrides methods
  of V1. Looking for be a better solution!

Author: coderarjob

README.md

@@ -46,13 +46,20 @@ Here is the rough roadmap of the development.
 
 ----
 
+- [X] Bug Fixes: Some minor fixes in UI
+- [X] Feature: Added new parser for reading older Kindle Clippings format.
+- [X] UI change to select different parsers.
+- [ ] **Alpha Release 4**
+
+----
+
 - [ ] Fine tune the rough edges in the supporting library.
 - [ ] Memory/Resource optimization.
 - [ ] Finalizing and optimizing the Graphical User Interface.
 - [ ] **Beta Release**
 
 ## Requirements
-- JRE 1.8 or higher
+- JRE 1.8 or higher __Note: JRE headless will not work.__
 - Linux, Windows
 - Mac OS
 

build.sh

@@ -63,7 +63,7 @@ cp -r src/coderarjob/kpdfsync/poc/res $BIN_DIR/coderarjob/kpdfsync/poc || exit
 # -----------------------------------------------------------------------------
 # Replace placeholder information in resource files.
 # -----------------------------------------------------------------------------
-VER=0.9.0
+VER=0.10.0
 TAG=alpha
 buildid=$(date +%y%m%d)
 

docs/images/screenshot_alpha.png

@@ -18,7 +18,6 @@ public abstract class AbstractParser
   /* Abstract protected methods */
   protected abstract boolean isTerminationLine (String linestr);
   protected abstract boolean parseLine(int linei, ParserResult res) throws Exception;
-  //protected abstract AbstractKindleParserConstants  getKindleParserConstants();
 
   /* Protected fields */
   protected String           mFileName;
@@ -29,7 +28,6 @@ public abstract class AbstractParser
                                                 False indicates, no error, or file pointer has
                                                 moved to the next block after the previous parsing
                                                 error.*/
-  //protected AbstractKindleParserConstants mConstants = null;
 
   /* Private fields */
   private long   mLastFilePointer;
@@ -88,7 +86,6 @@ public AbstractParser (String fileName) throws FileNotFoundException, IOExceptio
     this.mLastFilePointer = -1;
     this.mParserEvents = null;
     this.mIsInvalidState = false;
-    //this.mConstants = getKindleParserConstants();
   }
 
   /**
@@ -188,16 +185,6 @@ protected ParserException genParserException (String field)
       return new ParserException (errDes);
   }
 
-  /**
-   * Checks if the specified line is the termination line.
-   */
-  /*protected boolean isTerminationLine (String linestr)
-  {
-    assert (linestr != null);
-    ParserResultFieldsFilter<Boolean> filter = mConstants.getTerminationLineFilter();
-    return filter.getOrDefault(linestr, false);
-  }*/
-
   /**
    * Checks if End of File has been reached.
    */

src/coderarjob/kpdfsync/lib/clipparser/AbstractKindleParserConstants.java

@@ -43,49 +43,6 @@ public String toString()
     }
 
     /* Implementing abstract methods from AbstractParser*/
-    protected boolean isTerminationLine (String linestr)
-    {
-      return linestr.toLowerCase().equals(TERMINATION_LINE_PATTERN);
-    }
-
-    /*protected AbstractKindleParserConstants getKindleParserConstants ()
-    {
-      AbstractKindleParserConstants constants = new AbstractKindleParserConstants () {
-        public ParserResultFieldsFilter<AnnotationType> getAnnotationTypeFilter(ParserResult res)
-        {
-          Hashtable<String, AnnotationType> ht = new Hashtable<>();
-          ht.put("highlight", AnnotationType.HIGHLIGHT);
-          ht.put("note", AnnotationType.NOTE);
-          ht.put("bookmark", AnnotationType.BOOKMARK);
-
-          return new ParserResultFieldsFilter<> (2, ht);
-        }
-
-        public ParserResultFieldsFilter<PageNumberType> getPageNumberTypeFilter(ParserResult res)
-        {
-          Hashtable<String, PageNumberType> ht = new Hashtable<>();
-          ht.put("page", PageNumberType.PAGE_NUMBER);
-          ht.put("location", PageNumberType.LOCATION_NUMBER);
-
-          return new ParserResultFieldsFilter<> (4, ht);
-        }
-
-        public ParserResultFieldsFilter<Object> getPageOrLocationNumberFilter(ParserResult res)
-        {
-          return new ParserResultFieldsFilter<> (5, null);
-        }
-
-        public ParserResultFieldsFilter<Boolean> getTerminationLineFilter()
-        {
-          Hashtable<String, Boolean> ht = new Hashtable<>();
-          ht.put ("==========", true);
-          return new ParserResultFieldsFilter<> (0, ht);
-        }
-      };
-
-      return constants;
-    }*/
-
     public String getParserVersion ()
     {
         return "1.0";
@@ -96,6 +53,14 @@ public String[] getSupportedKindleVersions ()
         return new String[] {"5.12.*", "newer"};
     }
 
+    /**
+     * Checks if the specified line is the termination line.
+     */
+    protected boolean isTerminationLine (String linestr)
+    {
+      return linestr.toLowerCase().equals(TERMINATION_LINE_PATTERN);
+    }
+
     /**
      * Parses each line of the current block.
      * Returns a ParserResult object with the parsed result.

src/coderarjob/kpdfsync/lib/clipparser/AbstractParser.java

@@ -51,45 +51,6 @@ public String[] getSupportedKindleVersions ()
         return new String[] {"3.4.3", "older"};
     }
 
-    /*protected AbstractKindleParserConstants getKindleParserConstants ()
-    {
-      AbstractKindleParserConstants constants = new AbstractKindleParserConstants () {
-        public ParserResultFieldsFilter<AnnotationType> getAnnotationTypeFilter(ParserResult res)
-        {
-          Hashtable<String, AnnotationType> ht = new Hashtable<>();
-          ht.put("highlight", AnnotationType.HIGHLIGHT);
-          ht.put("note", AnnotationType.NOTE);
-          ht.put("bookmark", AnnotationType.BOOKMARK);
-
-          return new ParserResultFieldsFilter<> (1, ht);
-        }
-
-        public ParserResultFieldsFilter<PageNumberType> getPageNumberTypeFilter(ParserResult res)
-        {
-          Hashtable<String, PageNumberType> ht = new Hashtable<>();
-          ht.put("page", PageNumberType.PAGE_NUMBER);
-          ht.put("location", PageNumberType.LOCATION_NUMBER);
-          ht.put("loc.", PageNumberType.LOCATION_NUMBER);
-
-          return new ParserResultFieldsFilter<> (3, ht);
-        }
-
-        public ParserResultFieldsFilter<Object> getPageOrLocationNumberFilter(ParserResult res)
-        {
-          return new ParserResultFieldsFilter<> (4, null);
-        }
-
-        public ParserResultFieldsFilter<Boolean> getTerminationLineFilter()
-        {
-          Hashtable<String, Boolean> ht = new Hashtable<>();
-          ht.put ("==========", true);
-          return new ParserResultFieldsFilter<> (0, ht);
-        }
-      };
-
-      return constants;
-    }*/
-
     protected void parseAnnotationType (ParserResult result) throws IOException, ParserException
     {
         /* Read current line. Cannot be EOF.*/

src/coderarjob/kpdfsync/lib/clipparser/KindleParserV1.java

@@ -744,6 +744,7 @@ public void run() {
         break;
       case CLIPPING_FILE_SELECTED:
         selectBookNameComboBox.removeAllItems ();
+        browseClippingsFileButton.setEnabled (true);
         selectKindleVersionComboBox.setEnabled (true);
         parserKindleSupportInfoButton.setEnabled (false);
         break;