[Lexi-checkins] lexi/src/com/jmonkey/office/lexi DocumentFrame.java,1.1,1.2 DocumentManager.java,1.9,1.10 Lexi.java,1.14,1.15

[Stephen C. <cr...@us...>]

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

Modified Files:
	DocumentFrame.java DocumentManager.java Lexi.java 
Log Message:
Fixed bug #1305539 - after removing some strange logic, the problem 
was that the DocumentFrame was incorrectly triggering on the reversion
PropertyChangeEvent that occurred when the frame close was vetoed.


Index: DocumentManager.java
===================================================================
RCS file: /cvsroot/lexi/lexi/src/com/jmonkey/office/lexi/DocumentManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DocumentManager.java	26 Sep 2005 12:37:29 -0000	1.9
--- DocumentManager.java	28 Sep 2005 14:55:25 -0000	1.10
***************
*** 462,468 ****
      m_currentDoc = (DocumentFrame) f;
      if (m_parent != null) {
!       // m_parent.setTitle("[" + f.getTitle() +
!       // (m_currentDoc.getEditor().isChanged() ? "] *" : "]"));
!       documentChanged(m_currentDoc, false);
      }
      super.activateFrame(f);
--- 462,466 ----
      m_currentDoc = (DocumentFrame) f;
      if (m_parent != null) {
!       switchedDocument(m_currentDoc, false);
      }
      super.activateFrame(f);
***************
*** 494,500 ****
    }
  
!   protected final void documentChanged(DocumentFrame frame,
        boolean textSelected) {
!     m_parent.a_documentFrameChanged(frame, textSelected);
    }
  
--- 492,498 ----
    }
  
!   protected final void switchedDocument(DocumentFrame frame,
        boolean textSelected) {
!     m_parent.switchedDocumentFrame(frame, textSelected);
    }
  
***************
*** 618,628 ****
            editorSave(ed);
          }
-         // active().setClosed(true);
          return !ed.isChanged();
        case JOptionPane.NO_OPTION:
-         // active().setClosed(true);
          return true;
-       case JOptionPane.CANCEL_OPTION:
-       case JOptionPane.CLOSED_OPTION:
        default:
          return false;
--- 616,622 ----
***************
*** 630,635 ****
      }
      else {
!       // editorSave(active().getEditor());
!       return !ed.isChanged();
      }
    }
--- 624,628 ----
      }
      else {
!       return true;
      }
    }

Index: DocumentFrame.java
===================================================================
RCS file: /cvsroot/lexi/lexi/src/com/jmonkey/office/lexi/DocumentFrame.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DocumentFrame.java	5 Sep 2005 15:51:14 -0000	1.1
--- DocumentFrame.java	28 Sep 2005 14:55:25 -0000	1.2
***************
*** 55,60 ****
    private Editor m_editor;
  
-   private boolean m_veto = true;
- 
    public DocumentFrame(Lexi app, String contentType) {
      super();
--- 55,58 ----
***************
*** 100,113 ****
        throws PropertyVetoException {
      Code.event(evt);
!     Code.message(evt.getPropertyName());
!     if (evt.getPropertyName().equals("closed")) {
!       if (m_veto) {
!         if (!m_app.getDesktopManager().closeActiveDocument()) {
!           throw new PropertyVetoException("closed", evt);
!         }
!         m_veto = !m_veto;
!       }
!       else {
!         m_veto = !m_veto;
        }
      }
--- 98,106 ----
        throws PropertyVetoException {
      Code.event(evt);
!     if (evt.getPropertyName().equals("closed") && 
!         ((Boolean) evt.getNewValue()).booleanValue()) {
!       if (!m_app.getDesktopManager().closeActiveDocument()) {
!         Code.debug("vetoed close");
!         throw new PropertyVetoException("closed", evt);
        }
      }

Index: Lexi.java
===================================================================
RCS file: /cvsroot/lexi/lexi/src/com/jmonkey/office/lexi/Lexi.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Lexi.java	24 Sep 2005 15:24:00 -0000	1.14
--- Lexi.java	28 Sep 2005 14:55:25 -0000	1.15
***************
*** 601,605 ****
    }
  
!   protected final void a_documentFrameChanged(DocumentFrame frame,
        boolean textSelected) {
      setTitle("Main - [" + frame.getTitle()
--- 601,605 ----
    }
  
!   protected final void switchedDocumentFrame(DocumentFrame frame,
        boolean textSelected) {
      setTitle("Main - [" + frame.getTitle()