[Lexi-checkins] lexi/src/com/jmonkey/office/lexi/support/editors StyledEditor.java,1.2,1.3 TEXTEdito

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/lexi/lexi/src/com/jmonkey/office/lexi/support/editors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18803/src/com/jmonkey/office/lexi/support/editors

Modified Files:
	StyledEditor.java TEXTEditor.java 
Log Message:
The methods for reading/inserting/appending/writing an editor's
text context are now synchronous.  Previously they performed the
I/O asynchronously, which is unnecessary and risks problems.  


Index: StyledEditor.java
===================================================================
RCS file: /cvsroot/lexi/lexi/src/com/jmonkey/office/lexi/support/editors/StyledEditor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StyledEditor.java	2 Oct 2005 03:31:59 -0000	1.2
--- StyledEditor.java	30 Oct 2005 15:53:26 -0000	1.3
***************
*** 159,190 ****
  
    public void append(File file) throws IOException {
!     EditorActionManager.threads(new FRThread(file) {
!       public void run() {
!         BufferedInputStream bis = null;
!         try {
!           bis = new BufferedInputStream(new FileInputStream(m_frtFile));
!           StyledEditorKit kit = (StyledEditorKit) m_editor.getEditorKit();
!           StyledDocument doc = m_editor.getStyledDocument();
!           kit.read(bis, doc, doc.getLength());
!           setChanged(true);
!         }
!         catch (BadLocationException ble0) {
!           Code.failed(ble0);
!         }
!         catch (IOException ioe0) {
!           Code.failed(ioe0);
!         }
!         finally {
!           if (bis != null) {
!             try {
!               bis.close();
!             }
!             catch (Throwable t) {
!               // FIXME
!             }
!           }
!         }
        }
!     });
    }
  
--- 159,178 ----
  
    public void append(File file) throws IOException {
!     BufferedInputStream bis = null;
!     try {
!       bis = new BufferedInputStream(new FileInputStream(file));
!       StyledEditorKit kit = (StyledEditorKit) m_editor.getEditorKit();
!       StyledDocument doc = m_editor.getStyledDocument();
!       kit.read(bis, doc, doc.getLength());
!       setChanged(true);
!     }
!     catch (BadLocationException ble0) {
!       Code.failed(ble0);
!     }
!     finally {
!       if (bis != null) {
!         bis.close();
        }
!     }
    }
  
***************
*** 311,341 ****
  
    public void insert(File file, int position) throws IOException {
!     EditorActionManager.threads(new FRThread(file, position) {
!       public void run() {
!         BufferedInputStream bis = null;
!         try {
!           bis = new BufferedInputStream(new FileInputStream(m_frtFile));
!           StyledEditorKit kit = (StyledEditorKit) m_editor.getEditorKit();
!           kit.read(bis, m_editor.getStyledDocument(), m_position);
!           setChanged(true);
!         }
!         catch (BadLocationException ble0) {
!           Code.failed(ble0);
!         }
!         catch (IOException ioe0) {
!           Code.failed(ioe0);
!         }
!         finally {
!           if (bis != null) {
!             try {
!               bis.close();
!             }
!             catch (Throwable t) {
!               // FIXME
!             }
!           }
!         }
        }
!     });
    }
  
--- 299,317 ----
  
    public void insert(File file, int position) throws IOException {
!     BufferedInputStream bis = null;
!     try {
!       bis = new BufferedInputStream(new FileInputStream(file));
!       StyledEditorKit kit = (StyledEditorKit) m_editor.getEditorKit();
!       kit.read(bis, m_editor.getStyledDocument(), position);
!       setChanged(true);
!     }
!     catch (BadLocationException ble0) {
!       Code.failed(ble0);
!     }
!     finally {
!       if (bis != null) {
!         bis.close();
        }
!     }
    }
  
***************
*** 427,457 ****
  
    public void read(File file) throws IOException {
!     EditorActionManager.threads(new FRThread(file) {
!       public void run() {
!         BufferedInputStream bis = null;
!         try {
!           bis = new BufferedInputStream(new FileInputStream(m_frtFile));
!           StyledEditorKit kit = (StyledEditorKit) m_editor.getEditorKit();
!           kit.read(bis, m_editor.getStyledDocument(), 0);
!           setChanged(false);
!         }
!         catch (BadLocationException ble0) {
!           Code.failed(ble0);
!         }
!         catch (IOException ioe0) {
!           Code.failed(ioe0);
!         }
!         finally {
!           if (bis != null) {
!             try {
!               bis.close();
!             }
!             catch (Throwable t) {
!               // FIXME
!             }
!           }
!         }
        }
!     });
    }
  
--- 403,421 ----
  
    public void read(File file) throws IOException {
!     BufferedInputStream bis = null;
!     try {
!       bis = new BufferedInputStream(new FileInputStream(file));
!       StyledEditorKit kit = (StyledEditorKit) m_editor.getEditorKit();
!       kit.read(bis, m_editor.getStyledDocument(), 0);
!       setChanged(false);
!     }
!     catch (BadLocationException ble0) {
!       Code.failed(ble0);
!     }
!     finally {
!       if (bis != null) {
!         bis.close();
        }
!     }
    }
  
***************
*** 495,526 ****
  
    public void write(File file) throws IOException {
!     EditorActionManager.threads(new FWThread(file) {
!       public void run() {
!         BufferedOutputStream bos = null;
!         try {
!           bos = new BufferedOutputStream(new FileOutputStream(m_fwtFile));
!           StyledEditorKit kit = (StyledEditorKit) m_editor.getEditorKit();
!           StyledDocument doc = m_editor.getStyledDocument();
!           kit.write(bos, doc, 0, doc.getLength());
!           setChanged(false);
!         }
!         catch (BadLocationException ble0) {
!           Code.failed(ble0);
!         }
!         catch (IOException ioe0) {
!           Code.failed(ioe0);
!         }
!         finally {
!           if (bos != null) {
!             try {
!               bos.close();
!             }
!             catch (Throwable t) {
!               // FIXME
!             }
!           }
!         }
        }
!     });
    }  
  
--- 459,478 ----
  
    public void write(File file) throws IOException {
!     BufferedOutputStream bos = null;
!     try {
!       bos = new BufferedOutputStream(new FileOutputStream(file));
!       StyledEditorKit kit = (StyledEditorKit) m_editor.getEditorKit();
!       StyledDocument doc = m_editor.getStyledDocument();
!       kit.write(bos, doc, 0, doc.getLength());
!       setChanged(false);
!     }
!     catch (BadLocationException ble0) {
!       Code.failed(ble0);
!     }
!     finally {
!       if (bos != null) {
!         bos.close();
        }
!     }
    }  
  

Index: TEXTEditor.java
===================================================================
RCS file: /cvsroot/lexi/lexi/src/com/jmonkey/office/lexi/support/editors/TEXTEditor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TEXTEditor.java	2 Oct 2005 03:31:59 -0000	1.10
--- TEXTEditor.java	30 Oct 2005 15:53:26 -0000	1.11
***************
*** 165,196 ****
  
    public void append(File file) throws IOException {
!     EditorActionManager.threads(new FRThread(file) {
!       public void run() {
!         BufferedReader br = null;
!         try {
!           br = new BufferedReader(new FileReader(m_frtFile));
!           EditorKit kit = m_editor.getEditorKit();
!           Document doc = m_editor.getDocument();
!           kit.read(br, doc, doc.getLength());
!           setChanged(true);
!         }
!         catch (BadLocationException ble0) {
!           Code.failed(ble0);
!         }
!         catch (IOException ioe0) {
!           Code.failed(ioe0);
!         }
!         finally {
!           if (br != null) {
!             try {
!               br.close();
!             }
!             catch (Throwable t) {
!               // FIXME
!             }
!           }
!         }
        }
!     });
    }
  
--- 165,184 ----
  
    public void append(File file) throws IOException {
!     BufferedReader br = null;
!     try {
!       br = new BufferedReader(new FileReader(file));
!       EditorKit kit = m_editor.getEditorKit();
!       Document doc = m_editor.getDocument();
!       kit.read(br, doc, doc.getLength());
!       setChanged(true);
!     }
!     catch (BadLocationException ble0) {
!       Code.failed(ble0);
!     }
!     finally {
!       if (br != null) {
!         br.close();
        }
!     }
    }
  
***************
*** 319,349 ****
  
    public void insert(File file, int position) throws IOException {
!     EditorActionManager.threads(new FRThread(file, position) {
!       public void run() {
!         BufferedReader br = null;
!         try {
!           br = new BufferedReader(new FileReader(m_frtFile));
!           EditorKit kit = m_editor.getEditorKit();
!           kit.read(br, m_editor.getDocument(), m_position);
!           setChanged(true);
!         }
!         catch (BadLocationException ble0) {
!           Code.failed(ble0);
!         }
!         catch (IOException ioe0) {
!           Code.failed(ioe0);
!         }
!         finally {
!           if (br != null) {
!             try {
!               br.close();
!             }
!             catch (Throwable t) {
!               // FIXME
!             }
!           }
!         }
        }
!     });
    }
  
--- 307,325 ----
  
    public void insert(File file, int position) throws IOException {
!     BufferedReader br = null;
!     try {
!       br = new BufferedReader(new FileReader(file));
!       EditorKit kit = m_editor.getEditorKit();
!       kit.read(br, m_editor.getDocument(), position);
!       setChanged(true);
!     }
!     catch (BadLocationException ble0) {
!       Code.failed(ble0);
!     }
!     finally {
!       if (br != null) {
!         br.close();
        }
!     }
    }
  
***************
*** 404,434 ****
  
    public void read(File file) throws IOException {
!     EditorActionManager.threads(new FRThread(file) {
!       public void run() {
!         BufferedReader br = null;
!         try {
!           br = new BufferedReader(new FileReader(m_frtFile));
!           m_editor.getEditorKit().read(br, m_editor.getDocument(), 0);
!           setChanged(false);
!         }
!         catch (BadLocationException ble0) {
!           Code.failed(ble0);
!         }
!         catch (IOException ioe0) {
!           Code.failed(ioe0);
!         }
!         finally {
!           if (br != null) {
!             try {
!               br.close();
!             }
!             catch (Throwable t) {
!               // FIXME
!             }
!           }
!         }
!         // ===============================
        }
!     });
    }
  
--- 380,397 ----
  
    public void read(File file) throws IOException {
!     BufferedReader br = null;
!     try {
!       br = new BufferedReader(new FileReader(file));
!       m_editor.getEditorKit().read(br, m_editor.getDocument(), 0);
!       setChanged(false);
!     }
!     catch (BadLocationException ble0) {
!       Code.failed(ble0);
!     }
!     finally {
!       if (br != null) {
!         br.close();
        }
!     }
    }
  
***************
*** 463,494 ****
  
    public void write(File file) throws IOException {
!     EditorActionManager.threads(new FWThread(file) {
!       public void run() {
!         BufferedWriter bw = null;
!         try {
!           bw = new BufferedWriter(new FileWriter(m_fwtFile));
!           EditorKit kit = m_editor.getEditorKit();
!           Document doc = m_editor.getDocument();
!           kit.write(bw, doc, 0, doc.getLength());
!           setChanged(false);
!         }
!         catch (BadLocationException ble0) {
!           Code.failed(ble0);
!         }
!         catch (IOException ioe0) {
!           Code.failed(ioe0);
!         }
!         finally {
!           if (bw != null) {
!             try {
!               bw.close();
!             }
!             catch (Throwable t) {
!               // FIXME
!             }
!           }
!         }
        }
!     });
    }
  }
--- 426,445 ----
  
    public void write(File file) throws IOException {
!     BufferedWriter bw = null;
!     try {
!       bw = new BufferedWriter(new FileWriter(file));
!       EditorKit kit = m_editor.getEditorKit();
!       Document doc = m_editor.getDocument();
!       kit.write(bw, doc, 0, doc.getLength());
!       setChanged(false);
!     }
!     catch (BadLocationException ble0) {
!       Code.failed(ble0);
!     }
!     finally {
!       if (bw != null) {
!         bw.close();
        }
!     }
    }
  }

[Lexi-checkins] lexi/src/com/jmonkey/office/lexi/support/editors StyledEditor.java,1.2,1.3 TEXTEdito

[Lexi-checkins] lexi/src/com/jmonkey/office/lexi/support/editors StyledEditor.java,1.2,1.3 TEXTEditor.java,1.10,1.11