Changes:

1. Added the ability to set a comment received from an editor as "Dealt with", a visual indicator in the chapter list shows it is dealt with. 2. Added the ability to have "tools" for each chapter item, which are a set of controls added to the button bar for each chapter item when displayed. 3. Information about comments dealt with is stored in the project comments properties field as a map of comment id to date/time dealt with. 4. Only a single item can now be displayed (the popup) in the editor chapter panel. 5. Edit complete markers are no longer shown in the chapter list or icon column for an editor project. 6. The editors schema version has been updated, the only change is a change to the message view (message.v) which now extracts the properties for the message.
garybentley · Nov 9, 2016 · 13f585d · 13f585d
1 parent db97ddf
commit 13f585d
Show file tree

Hide file tree

Showing 27 changed files with 1,126 additions and 802 deletions.
diff --git a/build.xml b/build.xml
@@ -77,7 +77,7 @@
       <classpath>
         <fileset dir="./3rd-party-jars/"
                  includes="*.jar" />
-        <fileset dir="./3rd-party-jars/docx4j-jars"
+        <fileset dir="./3rd-party-jars/docx4j"
                  includes="*.jar" />
       </classpath>
     </java>
@@ -101,7 +101,7 @@
       <classpath>
         <fileset dir="./3rd-party-jars/"
                  includes="*.jar" />
-        <fileset dir="./3rd-party-jars/docx4j-jars"
+        <fileset dir="./3rd-party-jars/docx4j"
                  includes="*.jar" />
       </classpath>
     </java>
@@ -117,7 +117,7 @@
       <classpath>
         <fileset dir="./3rd-party-jars/"
                  includes="*.jar" />
-        <fileset dir="./3rd-party-jars/docx4j-jars"
+        <fileset dir="./3rd-party-jars/docx4j"
                  includes="*.jar" />
         <fileset dir="./installer"
                  includes="log4j.xml" />
@@ -382,7 +382,7 @@
       <classpath>
         <fileset dir="./3rd-party-jars/"
                  includes="*.jar" />
-        <fileset dir="./3rd-party-jars/docx4j-jars"
+        <fileset dir="./3rd-party-jars/docx4j"
                  includes="*.jar" />
       </classpath>
     </javac>
@@ -412,7 +412,7 @@
       <classpath>
         <fileset dir="./3rd-party-jars/"
                  includes="*.jar" />
-        <fileset dir="./3rd-party-jars/docx4j-jars"
+        <fileset dir="./3rd-party-jars/docx4j"
                  includes="*.jar" />
       </classpath>
 
@@ -435,7 +435,7 @@
       <classpath>
         <fileset dir="./3rd-party-jars/"
                  includes="*.jar" />
-        <fileset dir="./3rd-party-jars/docx4j-jars"
+        <fileset dir="./3rd-party-jars/docx4j"
                  includes="*.jar" />
       </classpath>
     </java>
@@ -450,7 +450,7 @@
       <classpath>
         <fileset dir="./3rd-party-jars/"
                  includes="*.jar" />
-        <fileset dir="./3rd-party-jars/docx4j-jars"
+        <fileset dir="./3rd-party-jars/docx4j"
                  includes="*.jar" />
       </classpath>
     </java>
@@ -465,7 +465,7 @@
       <classpath>
         <fileset dir="./3rd-party-jars/"
                  includes="*.jar" />
-        <fileset dir="./3rd-party-jars/docx4j-jars"
+        <fileset dir="./3rd-party-jars/docx4j"
                  includes="*.jar" />
       </classpath>
     </java>
@@ -481,7 +481,7 @@
       <classpath>
         <fileset dir="./3rd-party-jars/"
                  includes="*.jar" />
-        <fileset dir="./3rd-party-jars/docx4j-jars"
+        <fileset dir="./3rd-party-jars/docx4j"
                  includes="*.jar" />
       </classpath>
     </javac>
@@ -493,7 +493,7 @@
       <classpath>
         <fileset dir="./3rd-party-jars/"
                  includes="*.jar" />
-        <fileset dir="./3rd-party-jars/docx4j-jars"
+        <fileset dir="./3rd-party-jars/docx4j"
                  includes="*.jar" />
       </classpath>
     </java>
@@ -510,7 +510,7 @@
                  includes="*.jar" />
         <fileset dir="./3rd-party-jars/"
                  includes="*.jar" />
-        <fileset dir="./3rd-party-jars/docx4j-jars"
+        <fileset dir="./3rd-party-jars/docx4j"
                  includes="*.jar" />
       </classpath>
       <formatter type="plain" />
@@ -540,7 +540,7 @@
                  includes="*.jar" />
         <fileset dir="./3rd-party-jars/"
                  includes="*.jar" />
-        <fileset dir="./3rd-party-jars/docx4j-jars"
+        <fileset dir="./3rd-party-jars/docx4j"
                  includes="*.jar" />
         <fileset dir="${testBinDir}"
                  includes="*.jar" />

diff --git a/data/editor-schema/views/message.v b/data/editor-schema/views/message.v
@@ -12,6 +12,7 @@ SELECT m.dbkey dbkey,
        d.datecreated datecreated,
        d.objecttype objecttype,
        d.id id,
+       d.properties properties,
        m.editordbkey editordbkey
 FROM   dataobject d,
        message    m

diff --git a/data/editors-schema-version.txt b/data/editors-schema-version.txt
@@ -1 +1 @@
-2
+3
diff --git a/data/version.txt b/data/version.txt
@@ -1 +1 @@
-2.5.2
+2.5.4
diff --git a/src/com/quollwriter/Constants.java b/src/com/quollwriter/Constants.java
@@ -665,6 +665,8 @@ public class Constants
     public static final String STAR_ICON_NAME = "star";
     public static final String SORT_ICON_NAME = "sort";
     public static final String TARGET_ICON_NAME = "goals";
+    public static final String SET_DEALT_WITH_ICON_NAME = "save" ;//"accepted";
+    public static final String SET_UNDEALT_WITH_ICON_NAME = "cancel"; //"clear";
 
     public static final String SHOW_FIND_ACTION = "find-show";
 

diff --git a/src/com/quollwriter/Startup.java b/src/com/quollwriter/Startup.java
@@ -16,7 +16,7 @@ public class Startup
 
     public static void main (String[] argv)
     {
-    
+
         if ((argv != null) &&
             (argv.length > 0))
         {
@@ -31,7 +31,7 @@ public static void main (String[] argv)
         }
 
         SplashScreen ss = null;
-        
+
         try
         {
 
@@ -45,20 +45,20 @@ public static void main (String[] argv)
 
             if (Environment.isFirstUse ())
             {
-                
+
                 new FirstUseWizard ().init ();
-                
+
                 return;
-                
+
             }
-            
+
             if (Environment.getAllProjectInfos ().size () == 0)
             {
 
                 ss.finish ();
 
                 Environment.showLanding ();
-                
+
                 return;
 
             }
@@ -69,21 +69,21 @@ public static void main (String[] argv)
             {
 
                 Environment.showLanding ();
-            
+
             }
 
             // See if the user property is to open the last edited project.
             if (UserProperties.getAsBoolean (Constants.OPEN_LAST_EDITED_PROJECT_PROPERTY_NAME))
             {
-            
+
                 try
                 {
 
                     if (!Environment.openLastEditedProject ())
                     {
 
                         showError = true;
-                        
+
                     }
 
                 } catch (Exception e)
@@ -93,7 +93,7 @@ public static void main (String[] argv)
 
                 }
 
-            } 
+            }
 
             // Need to do this here since, if there is no visible frame (somewhere) then showErrorMessage will throw an error that crashes the jvm... nice...
             if (showError)
@@ -106,30 +106,30 @@ public static void main (String[] argv)
                                      "Unable to open last edited {project}, please select another {project} or create a new one.");
 
             }
-            
+
         } catch (Exception eee)
         {
 
             if (eee instanceof OverlappingFileLockException)
             {
-                
+
                 UIUtils.showErrorMessage (null,
                                           "It appears that Quoll Writer is already running.  Please close the other instance before starting Quoll Writer again.");
-                
-                
+
+
             } else {
-        
+
                 Environment.logError ("Unable to open Quoll Writer",
                                       eee);
-    
+
                 UIUtils.showErrorMessage (null,
                                           "Unable to start Quoll Writer");
 
             }
-                                          
+
         } finally
-        {        
-        
+        {
+
             if (ss != null)
             {
 
@@ -138,7 +138,7 @@ public static void main (String[] argv)
             }
 
             Environment.startupComplete ();
-            
+
         }
 
     }

diff --git a/src/com/quollwriter/data/Project.java b/src/com/quollwriter/data/Project.java
@@ -1774,6 +1774,13 @@ public boolean equals (Object o)
 
         Project po = (Project) o;
 
+        if (this.projectDirectory == null)
+        {
+
+            return false;
+
+        }
+
         return this.projectDirectory.equals (po.projectDirectory);
 
     }

diff --git a/src/com/quollwriter/db/EditorMessageDataHandler.java b/src/com/quollwriter/db/EditorMessageDataHandler.java
@@ -24,7 +24,7 @@
 public class EditorMessageDataHandler implements DataHandler<EditorMessage, EditorEditor>
 {
 
-    private static final String STD_SELECT_PREFIX = "SELECT dbkey, type, when, sentbyme, editordbkey, forprojectid, messageid, message, dealtwith FROM message_v";
+    private static final String STD_SELECT_PREFIX = "SELECT dbkey, type, when, sentbyme, editordbkey, forprojectid, messageid, message, properties, dealtwith FROM message_v";
 
     private ObjectManager objectManager = null;
 
@@ -358,6 +358,7 @@ private EditorMessage getMessage (ResultSet rs)
             am.setForProjectId (rs.getString (ind++));
             am.setMessageId (rs.getString (ind++));            
             am.setMessage (rs.getString (ind++));
+            am.setPropertiesAsString (rs.getString (ind++));
             am.setDealtWith (rs.getBoolean (ind++));
 
             this.messageCache.put (key,

diff --git a/src/com/quollwriter/db/EditorProjectDataHandler.java b/src/com/quollwriter/db/EditorProjectDataHandler.java
@@ -154,7 +154,6 @@ private EditorProject getEditorProject (ResultSet rs)
 
             p.setKey (key);
             p.setId (rs.getString (ind++));
-            Environment.logMessage ("GOT PROJ ID AT LOAD: " + p.getId ());
             p.setName (rs.getString (ind++));
 
             String genres = rs.getString (ind++);

diff --git a/src/com/quollwriter/editors/messages/ProjectCommentsMessage.java b/src/com/quollwriter/editors/messages/ProjectCommentsMessage.java
@@ -18,6 +18,7 @@ public class ProjectCommentsMessage extends EditorMessage
     private Set<Note> comments = null;
     private String generalComment = null;
     private ProjectVersion projVer = null;
+    private Map<String, Date> commentsDealtWith = new HashMap ();
 
     public ProjectCommentsMessage ()
     {
@@ -65,6 +66,58 @@ public ProjectCommentsMessage (Project        project,
 
     }
 
+    @Override
+    public void setPropertiesAsString (String p)
+                                throws Exception
+    {
+
+        super.setPropertiesAsString (p);
+
+        String d = this.getProperty ("dealtwithcomments");
+
+        if (d != null)
+        {
+
+            // Decode the json.
+            Map m = (Map) JSONDecoder.decode (d);
+
+            this.commentsDealtWith.putAll (m);
+
+        }
+
+    }
+
+    public void setCommentDealtWith (String id,
+                                     Date   date)
+                              throws Exception
+    {
+
+        Map<String, Date> dealtWith = this.getCommentsDealtWith ();
+
+        if (date == null)
+        {
+
+            dealtWith.remove (id);
+
+        } else {
+
+            dealtWith.put (id,
+                           date);
+
+        }
+
+        this.setProperty ("dealtwithcomments",
+                          JSONEncoder.encode (dealtWith));
+
+    }
+
+    public Map<String, Date> getCommentsDealtWith ()
+    {
+
+        return this.commentsDealtWith;
+
+    }
+
     @Override
     public void fillToStringProperties (Map<String, Object> props)
     {

diff --git a/src/com/quollwriter/editors/ui/EditorsUIUtils.java b/src/com/quollwriter/editors/ui/EditorsUIUtils.java
@@ -5096,6 +5096,9 @@ public void actionPerformed (ActionEvent ev)
 
                         kchaps.put (c.getId (),
                                     c);
+
+                        c.setEditPosition (-1);
+                        c.setEditComplete (false);
 
                     }