[Gmod-apollo-cmts] CVS: apollo/src/java/apollo/gui ApolloFrame.java,1.125,1.126

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

Update of /cvsroot/gmod/apollo/src/java/apollo/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv373/src/java/apollo/gui

Modified Files:
	ApolloFrame.java 
Log Message:
I set out to add a transcript JComboBox/selectable list to the ede, which i did.
But I ended up doing a lot of refactoring. With the new selection
event that needed to go out, selection in the EDE was becoming this
entangled disaster that I couldnt get my head around anymore. There
were now 4 things causing selections, external selection to sometime
take in, and a bunch of things reflecting the selection state. So I
thought I would put in a mini selection manager/controller for the
ede. Then it occurred to me that I could use the main
SelectionManager/Controller, I would just have to do a bit more source
checking. So both the BaseEditorPanel and BaseFineEditor listen for
and spit out selections. If they see selections from each other they
deem it an internal selection that doesnt get filtered if the user has
clicked off external selection. This made selection a lot simpler than
trying to coordinate selection state between themselves and externally.



Index: ApolloFrame.java
===================================================================
RCS file: /cvsroot/gmod/apollo/src/java/apollo/gui/ApolloFrame.java,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -d -r1.125 -r1.126
*** ApolloFrame.java	22 Jan 2003 02:31:28 -0000	1.125
--- ApolloFrame.java	31 Jan 2003 00:11:12 -0000	1.126
***************
*** 413,423 ****
      BaseFineEditor bofe = new BaseFineEditor(ap,
  					     annot_view,
! 					     annot_view.getStrand() == -1);
      bofe.setController(controller);
      bofe.setSelectionManager(selectionManager);
!     bofe.scrollToFeature(editme,false); // false - dont fire selection
!     bofe.showEditRegion();
!     bofe.show();
!     bofe.setVisible (true);
      // Might just be linux, but bofe gets iconified on close
      if (bofe.getState()==Frame.ICONIFIED)
--- 413,424 ----
      BaseFineEditor bofe = new BaseFineEditor(ap,
  					     annot_view,
! 					     annot_view.getStrand() == -1,
! 					     editme);
      bofe.setController(controller);
      bofe.setSelectionManager(selectionManager);
!     //bofe.scrollToFeature(editme,false); // false - dont fire selection
!     //bofe.showEditRegion();
!     //bofe.show();
!     //bofe.setVisible (true);
      // Might just be linux, but bofe gets iconified on close
      if (bofe.getState()==Frame.ICONIFIED)