X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFontChooser.java;h=02a7471962ed5d0787b5a8c5803d333038596edf;hb=dc6d9b88b36c704faa61bcd3ed29a9e2f510bc83;hp=eb29211000138fc769fdc0bceef878abbf192634;hpb=99c58ee0ae2a848f982552e53feaf6d5cb9925e5;p=jalview.git

diff --git a/src/jalview/appletgui/FontChooser.java b/src/jalview/appletgui/FontChooser.java
index eb29211..02a7471 100755
--- a/src/jalview/appletgui/FontChooser.java
+++ b/src/jalview/appletgui/FontChooser.java
@@ -1,31 +1,30 @@
 /*
-* Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 AM Waterhouse, J Procter, 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 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.
-*
-* 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 - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2005 AM Waterhouse, J Procter, 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 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.
+ *
+ * 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
+ */
 
 package jalview.appletgui;
 
-import jalview.jbappletgui.GFontChooser;
-import jalview.appletgui.*;
 import java.awt.*;
-import java.awt.event.*;
 
+import jalview.jbappletgui.*;
 
-public class FontChooser extends GFontChooser
+public class FontChooser
+    extends GFontChooser
 {
   AlignmentPanel ap;
   Font oldFont;
@@ -40,29 +39,35 @@ public class FontChooser extends GFontChooser
 
     this.ap = ap;
     String fonts[] = Toolkit.getDefaultToolkit().getFontList();
-    for(int i=0; i<fonts.length; i++)
+    for (int i = 0; i < fonts.length; i++)
+    {
       fontName.addItem(fonts[i]);
+    }
 
-    for(int i=1; i<31; i++)
-      fontSize.addItem(i+"");
+    for (int i = 1; i < 31; i++)
+    {
+      fontSize.addItem(i + "");
+    }
 
-   fontStyle.addItem("plain");
-   fontStyle.addItem("bold");
-   fontStyle.addItem("italic");
+    fontStyle.addItem("plain");
+    fontStyle.addItem("bold");
+    fontStyle.addItem("italic");
 
-   oldFont = ap.av.getFont();
-   fontName.select(oldFont.getName());
-   fontSize.select(oldFont.getSize()+"");
-   fontStyle.select(oldFont.getStyle());
+    oldFont = ap.av.getFont();
+    fontName.select(oldFont.getName());
+    fontSize.select(oldFont.getSize() + "");
+    fontStyle.select(oldFont.getStyle());
 
-   init = false;
+    init = false;
   }
 
   protected void ok_actionPerformed()
   {
-      frame.setVisible(false);
-   if(ap.getOverviewPanel()!=null)
-     ap.getOverviewPanel().updateOverviewImage();
+    frame.setVisible(false);
+    if (ap.getOverviewPanel() != null)
+    {
+      ap.getOverviewPanel().updateOverviewImage();
+    }
   }
 
   protected void cancel_actionPerformed()
@@ -70,7 +75,7 @@ public class FontChooser extends GFontChooser
     ap.av.setFont(oldFont);
     ap.repaint();
     fontName.select(oldFont.getName());
-    fontSize.select(oldFont.getSize()+"");
+    fontSize.select(oldFont.getSize() + "");
     fontStyle.select(oldFont.getStyle());
 
     frame.setVisible(false);
@@ -80,28 +85,37 @@ public class FontChooser extends GFontChooser
   {
     Font newFont = new Font(fontName.getSelectedItem().toString(),
                             fontStyle.getSelectedIndex(),
-                            Integer.parseInt(fontSize.getSelectedItem().toString())
-                            );
+                            Integer.parseInt(fontSize.getSelectedItem().
+                                             toString())
+        );
     ap.av.setFont(newFont);
     ap.fontChanged();
   }
 
-
   protected void fontName_actionPerformed()
   {
-    if(init) return;
+    if (init)
+    {
+      return;
+    }
     changeFont();
   }
 
   protected void fontSize_actionPerformed()
   {
-    if(init) return;
+    if (init)
+    {
+      return;
+    }
     changeFont();
   }
 
   protected void fontStyle_actionPerformed()
   {
-    if(init) return;
+    if (init)
+    {
+      return;
+    }
     changeFont();
   }