X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGDesktop.java;h=5effdbd763dec7edd72a8194149b45f0e9ae27d2;hb=70889ff334002372e84073f843e9b1fae70c0cfb;hp=773267d1df5f05666cd54a07681c5d9acc8ac7a2;hpb=17c8e30466e7a52708ed95465151dd254617a7e4;p=jalview.git

diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java
index 773267d..5effdbd 100755
--- a/src/jalview/jbgui/GDesktop.java
+++ b/src/jalview/jbgui/GDesktop.java
@@ -1,20 +1,19 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
- * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
  * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  */
 package jalview.jbgui;
 
@@ -88,7 +87,7 @@ public class GDesktop extends JFrame
   JMenuItem garbageCollect = new JMenuItem();
 
   protected JCheckBoxMenuItem showConsole = new JCheckBoxMenuItem();
-  
+
   /**
    * Creates a new GDesktop object.
    */
@@ -121,7 +120,7 @@ public class GDesktop extends JFrame
    * DOCUMENT ME!
    * 
    * @throws Exception
-   *                 DOCUMENT ME!
+   *           DOCUMENT ME!
    */
   private void jbInit() throws Exception
   {
@@ -345,7 +344,7 @@ public class GDesktop extends JFrame
   protected void showConsole_actionPerformed(ActionEvent e)
   {
     // TODO Auto-generated method stub
-    
+
   }
 
   protected void showMemusage_actionPerformed(ActionEvent e)
@@ -372,7 +371,7 @@ public class GDesktop extends JFrame
    * DOCUMENT ME!
    * 
    * @param e
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    */
   protected void inputLocalFileMenuItem_actionPerformed(
           jalview.gui.AlignViewport av)
@@ -383,7 +382,7 @@ public class GDesktop extends JFrame
    * DOCUMENT ME!
    * 
    * @param e
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    */
   protected void inputURLMenuItem_actionPerformed(
           jalview.gui.AlignViewport av)
@@ -394,7 +393,7 @@ public class GDesktop extends JFrame
    * DOCUMENT ME!
    * 
    * @param e
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    */
   protected void inputTextboxMenuItem_actionPerformed(
           jalview.gui.AlignViewport av)
@@ -412,7 +411,7 @@ public class GDesktop extends JFrame
    * DOCUMENT ME!
    * 
    * @param e
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    */
   protected void aboutMenuItem_actionPerformed(ActionEvent e)
   {
@@ -422,7 +421,7 @@ public class GDesktop extends JFrame
    * DOCUMENT ME!
    * 
    * @param e
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    */
   protected void documentationMenuItem_actionPerformed(ActionEvent e)
   {
@@ -432,7 +431,7 @@ public class GDesktop extends JFrame
    * DOCUMENT ME!
    * 
    * @param e
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    */
   public void SaveState_actionPerformed(ActionEvent e)
   {
@@ -442,7 +441,7 @@ public class GDesktop extends JFrame
    * DOCUMENT ME!
    * 
    * @param e
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    */
   protected void preferences_actionPerformed(ActionEvent e)
   {
@@ -452,7 +451,7 @@ public class GDesktop extends JFrame
    * DOCUMENT ME!
    * 
    * @param e
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    */
   public void saveState_actionPerformed(ActionEvent e)
   {
@@ -462,7 +461,7 @@ public class GDesktop extends JFrame
    * DOCUMENT ME!
    * 
    * @param e
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    */
   public void loadState_actionPerformed(ActionEvent e)
   {
@@ -472,7 +471,7 @@ public class GDesktop extends JFrame
    * DOCUMENT ME!
    * 
    * @param e
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    */
   public void loadJalviewAlign_actionPerformed(ActionEvent e)
   {