[Gmod-apollo-cmts] CVS: apollo/src/java/apollo/gui/annotinfo GeneEditPanel.java,1.130,1.131

[Mark G. <mg...@us...>]

Update of /cvsroot/gmod/apollo/src/java/apollo/gui/annotinfo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16923/src/java/apollo/gui/annotinfo

Modified Files:
	GeneEditPanel.java 
Log Message:
fixed bug reported by sima - the name field in gene edit panel 
was not recognizing pasting 
as an edit - it was requiring a keystroke which doesnt happen on pasting



Index: GeneEditPanel.java
===================================================================
RCS file: /cvsroot/gmod/apollo/src/java/apollo/gui/annotinfo/GeneEditPanel.java,v
retrieving revision 1.130
retrieving revision 1.131
diff -C2 -d -r1.130 -r1.131
*** GeneEditPanel.java	5 Dec 2005 18:55:21 -0000	1.130
--- GeneEditPanel.java	16 Dec 2005 22:28:23 -0000	1.131
***************
*** 1048,1067 ****
    /** on focus lost from name field, checks name and commits it if ok.
        commit is modifying model and firing update event. */
!   private class GeneNameListener implements FocusListener, KeyListener, 
      DocumentListener {
  
      private boolean inFocus = false;
      private boolean documentEdited = false;
!     private boolean gotKeystroke = false;
      private boolean nameCommitted = true;
  
      private GeneNameListener(ReadWriteField nameField) {
        nameField.addFocusListener(this);
!       nameField.addKeyListener(this);
        nameField.getDocument().addDocumentListener(this);
      }
  
      private boolean nameBeingEdited() {
!       return inFocus && gotKeystroke && documentEdited && !nameCommitted;
      }
  
--- 1048,1068 ----
    /** on focus lost from name field, checks name and commits it if ok.
        commit is modifying model and firing update event. */
!   private class GeneNameListener implements FocusListener,// KeyListener, 
      DocumentListener {
  
      private boolean inFocus = false;
      private boolean documentEdited = false;
!     //private boolean gotKeystroke = false;
      private boolean nameCommitted = true;
  
      private GeneNameListener(ReadWriteField nameField) {
        nameField.addFocusListener(this);
!       //nameField.addKeyListener(this);
        nameField.getDocument().addDocumentListener(this);
      }
  
      private boolean nameBeingEdited() {
!       // cant require keystroke as can edit with pasting from mouse w no keystroke
!       return inFocus  && documentEdited && !nameCommitted; // && gotKeystroke
      }
  
***************
*** 1082,1102 ****
        inFocus = false;
        documentEdited = false;
!       gotKeystroke = false;
      }
  
!     /** KeyListener */
!     public void keyPressed(KeyEvent e) {
!       gotKeystroke = true;
!     }
!     public void keyReleased(KeyEvent e) {
!       gotKeystroke = true;
!     }
!     public void keyTyped(KeyEvent e) {
!       gotKeystroke = true;
!     }
  
      private void setDocumentEdited() {
!       if (!gotKeystroke) 
!         return;
        documentEdited = true;
        nameCommitted = false;
--- 1083,1103 ----
        inFocus = false;
        documentEdited = false;
!       //gotKeystroke = false;
      }
  
! //     /** KeyListener */
! //     public void keyPressed(KeyEvent e) {
! //       gotKeystroke = true;
! //     }
! //     public void keyReleased(KeyEvent e) {
! //       gotKeystroke = true;
! //     }
! //     public void keyTyped(KeyEvent e) {
! //       gotKeystroke = true;
! //     }
  
      private void setDocumentEdited() {
!       //if (!gotKeystroke) 
!       // return;
        documentEdited = true;
        nameCommitted = false;
***************
*** 1165,1169 ****
      // trigger editing model with focus lost & gained
      geneNameListener.focusGained(null);
!     geneNameListener.keyTyped(null);
      // edit gui
      setGuiName("new-name-test");
--- 1166,1171 ----
      // trigger editing model with focus lost & gained
      geneNameListener.focusGained(null);
!     //geneNameListener.keyTyped(null); // dont do keys - pasting
!     geneNameListener.insertUpdate(null);
      // edit gui
      setGuiName("new-name-test");