Changeset 15693 for gli/trunk

Timestamp:

2008-05-23T18:51:55+12:00 (16 years ago)

Author:

ak19

Message:

Corrected a miscalculation of the start_offset. Turned DocumentEvent into a member variable so that it can be constructed beforehand and fired when writing has finished in the WriterThread

File:

• gli/trunk/src/org/greenstone/gatherer/util/AppendLineOnlyFileDocument.java (modified) (5 diffs)

gli/trunk/src/org/greenstone/gatherer/util/AppendLineOnlyFileDocument.java

@@ -67 +67 @@
     /** An independant thread responsible for writing the 'in memory' contents of the document model to the random access file as appropriate. This is done so IO lag does not effect the gui as much as it used to. */
     private WriterThread writer;
-
+    
+    /** Keeps track of the document insert update event to be fired next (after a line element is written) */
+    private DocumentEvent event = null;
     
     public AppendLineOnlyFileDocument(String filename) {
@@ -117 +119 @@
     }
 
+    /** Notifies listeners of a document insert update event */
     protected void fireInsertUpdate(DocumentEvent event) {
     Object[] listeners = listeners_list.getListenerList(); 
@@ -159 +162 @@
         // Queue the content to be written.
         writer.queue(new_line_element);
-        // moved the firing of DocumentEvent to the WriterThread.run() method for when the new line is *actually* written to the document
-        // DocumentEvent event = new AppendLineOnlyFileDocumentEvent(new_line_element, (int)start_offset, str_length, DocumentEvent.EventType.INSERT); 
-        // fireInsertUpdate(event);
+
+        // moved the firing of DocumentEvent to the WriterThread.run() method for when the new line is *actually* written to the doc
+        event = new AppendLineOnlyFileDocumentEvent(new_line_element, (int)start_offset, str_length, DocumentEvent.EventType.INSERT); 
+        //fireInsertUpdate(event);
         new_line_element = null;
     }
@@ -787 +791 @@
             try {
                 write(element.getStartOffset(), element.getEndOffset(), content, content.getBytes("UTF-8").length);
-                
-                // Now fire an event so everyone knows the Document's content has changed.
-                int str_length = content.getBytes("UTF-8").length;
-                long start_offset = length;
-                DocumentEvent event = new AppendLineOnlyFileDocumentEvent(element, (int)start_offset, str_length, DocumentEvent.EventType.INSERT);
-                AppendLineOnlyFileDocument.this.fireInsertUpdate(event);
-                
             }
             catch(Exception error) {
                 DebugStream.printStackTrace(error);             
             }
-            element.clearContent();
+            // having written the element, we fire any document insert update event prepared earlier
+            if(event != null) {
+                AppendLineOnlyFileDocument.this.fireInsertUpdate(event);
+            }
+            element.clearContent();    
             }
         }
@@ -813 +814 @@
             }
             print("WriterThread.wait() complete");
-           }
+            }
         }
         }