[Gmod-apollo-cmts] CVS: apollo/src/java/apollo/gui/menus HelpMenu.java, 1.25, 1.26

[elee <gk...@us...>]

Update of /cvsroot/gmod/apollo/src/java/apollo/gui/menus
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29542/gui/menus

Modified Files:
	HelpMenu.java 
Log Message:
+ Updated project information in About



Index: HelpMenu.java
===================================================================
RCS file: /cvsroot/gmod/apollo/src/java/apollo/gui/menus/HelpMenu.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** HelpMenu.java	3 Jan 2007 13:50:40 -0000	1.25
--- HelpMenu.java	22 Dec 2007 01:05:24 -0000	1.26
***************
*** 65,69 ****
  
      help   .setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_H,
!                            ActionEvent.CTRL_MASK));
  
      update.addActionListener(this);
--- 65,69 ----
  
      help   .setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_H,
!         ActionEvent.CTRL_MASK));
  
      update.addActionListener(this);
***************
*** 74,78 ****
        showAboutBox();
      } else if (e.getSource() == help) {
! 	showHelpInBrowser();
      } else if (e.getSource() == bug) {
        logger.info("Loading bug tracker " + BUG_URL + " into web browser");
--- 74,78 ----
        showAboutBox();
      } else if (e.getSource() == help) {
!       showHelpInBrowser();
      } else if (e.getSource() == bug) {
        logger.info("Loading bug tracker " + BUG_URL + " into web browser");
***************
*** 114,120 ****
--- 114,122 ----
      if (aboutBox == null) {
        String    message;
+       /*
        String [] orgs         = new String[3];
        String [] authors      = new String[4];
        String [] debuggers    = new String[6];
+       */
        JPanel    groupPanel   = new JPanel   (new BorderLayout());
        JPanel    buttonPanel  = new JPanel   (true);
***************
*** 126,144 ****
  
        message = "Apollo is a collaborative open source project between ";
!       orgs[0] = new String("Berkeley Drosophila Genome Project");
!       orgs[1] = new String("Sanger Institute");
!       orgs[2] = new String("EBI");
  
!       authors[0] = new String("Steve Searle");
!       authors[1] = new String("John Richter");
!       authors[2] = new String("Suzanna Lewis");
!       authors[3] = new String("Michele Clamp");
  
!       debuggers[0] = new String("Suzanna Lewis");
!       debuggers[1] = new String("Nomi Harris");
!       debuggers[2] = new String("Mark Gibson");
!       debuggers[3] = new String("Vivek Iyer");
!       debuggers[4] = new String("Guanming Wu");
!       debuggers[5] = new String("Sima Misra");
  
        messBox.setEditable(false);
--- 128,150 ----
  
        message = "Apollo is a collaborative open source project between ";
!       String [] orgs = new String[] {
!         "Berkeley Drosophila Genome Project",
!         "TAIR",
!         "EBI"
!         };
  
!       String [] authors = new String[] {
!         "Steve Searle",
!         "John Richter",
!         "Suzanna Lewis",
!         "Michele Clamp"
!       };
  
!       String [] debuggers = new String[] {
!         "Ed Lee",
!         "Nomi Harris",
!         "Mark Gibson",
!         "Steve Searle"
!       };
  
        messBox.setEditable(false);
***************
*** 159,166 ****
          StyleConstants.setBold(attrs,true);
          doc.insertString(0, Version.getVersion() + "\n\n", attrs);
! 	if (Config.internalMode()) {
! 	  StyleConstants.setForeground(attrs, new Color(153,0,153));
! 	  doc.insertString(0, "Project Internal Version\n\n", attrs);
! 	}
          StyleConstants.setBold(attrs,false);
          StyleConstants.setForeground(attrs,Color.blue);
--- 165,172 ----
          StyleConstants.setBold(attrs,true);
          doc.insertString(0, Version.getVersion() + "\n\n", attrs);
!         if (Config.internalMode()) {
!           StyleConstants.setForeground(attrs, new Color(153,0,153));
!           doc.insertString(0, "Project Internal Version\n\n", attrs);
!         }
          StyleConstants.setBold(attrs,false);
          StyleConstants.setForeground(attrs,Color.blue);
***************
*** 213,219 ****
  
          doc.insertString(doc.getLength(),"\n\nAcknowledgements:\nErnest J. Friedman-Hill and Sandia National Laboratories for PSGr\n" +
!                          "David Goodstein for adding regular expression parsing to Find\n" +
!                          "Jonathan Crabtree for work on the Chado JDBC adapter\n" +
!                          "and others who have sent patches and suggestions.",attrs);
          // E.L.L. Sonnhammer and R. Durbin for Blixem
        } catch (Exception e) {
--- 219,228 ----
  
          doc.insertString(doc.getLength(),"\n\nAcknowledgements:\nErnest J. Friedman-Hill and Sandia National Laboratories for PSGr\n" +
!             "David Goodstein for adding regular expression parsing to Find\n" +
!             "Jonathan Crabtree for work on the Chado JDBC adapter\n" +
!             "Chris Wilks\n" +
!             "Olivier Arnaiz\n" +
!             "and others who have sent patches and suggestions.\n\n" +
!             "The Apollo project is supported by NIH grant 1R01GM080203-01 from NIGMS.",attrs);
          // E.L.L. Sonnhammer and R. Durbin for Blixem
        } catch (Exception e) {
***************
*** 236,244 ****
  
        button.addActionListener(new ActionListener() {
!                                  public void actionPerformed(ActionEvent e) {
!                                    aboutBox.setVisible(false);
!                                  }
!                                }
!                               );
      }
      aboutBox.pack();
--- 245,253 ----
  
        button.addActionListener(new ActionListener() {
!         public void actionPerformed(ActionEvent e) {
!           aboutBox.setVisible(false);
!         }
!       }
!       );
      }
      aboutBox.pack();