X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fappletgui%2FFontChooser.java;h=5df659bea612c99b1f0dec7ad8486ace17bf3631;hb=a3e8ea093f8e93e6ebaf6faa7a44615fdf75b020;hp=2f380845f3b3f44e42d852a86aad00d62dddda71;hpb=973ea5b735c3725ca2d1208c6dd32f2671069bbb;p=jalview.git

diff --git a/src/jalview/appletgui/FontChooser.java b/src/jalview/appletgui/FontChooser.java
index 2f38084..5df659b 100755
--- a/src/jalview/appletgui/FontChooser.java
+++ b/src/jalview/appletgui/FontChooser.java
@@ -1,13 +1,13 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
+ * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
  * 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.
- * 
+ *  
  * 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 
@@ -153,39 +153,43 @@ public class FontChooser extends Panel implements ActionListener,
     frame.setVisible(false);
   }
 
-  private Font lastSelected=null; 
-  private int lastSelStyle=0;
-  private int lastSelSize=0;
+  private Font lastSelected = null;
+
+  private int lastSelStyle = 0;
+
+  private int lastSelSize = 0;
+
   /**
    * DOCUMENT ME!
    */
   void changeFont()
   {
-    if (lastSelected==null)
+    if (lastSelected == null)
     {
       // initialise with original font
-      lastSelected=oldFont;
-      lastSelSize=oldFont.getSize();
-      lastSelStyle=oldFont.getStyle();
+      lastSelected = oldFont;
+      lastSelSize = oldFont.getSize();
+      lastSelStyle = oldFont.getStyle();
     }
-    
+
     Font newFont = new Font(fontName.getSelectedItem().toString(),
             fontStyle.getSelectedIndex(), Integer.parseInt(fontSize
                     .getSelectedItem().toString()));
     FontMetrics fm = getGraphics().getFontMetrics(newFont);
-    double mw=fm.getStringBounds("M", getGraphics())
-            .getWidth(),iw=fm.getStringBounds("I", getGraphics())
-                    .getWidth();
-    if (mw<1 || iw < 1) {
-    	// TODO: JAL-1100
+    double mw = fm.getStringBounds("M", getGraphics()).getWidth(), iw = fm
+            .getStringBounds("I", getGraphics()).getWidth();
+    if (mw < 1 || iw < 1)
+    {
+      // TODO: JAL-1100
       fontName.select(lastSelected.getName());
       fontStyle.select(lastSelStyle);
-      fontSize.select(""+lastSelSize);
-      JVDialog d = new JVDialog(this.frame, "Invalid Font", true, 350,200);
-      Panel mp=new Panel();
+      fontSize.select("" + lastSelSize);
+      JVDialog d = new JVDialog(this.frame, "Invalid Font", true, 350, 200);
+      Panel mp = new Panel();
       d.cancel.setVisible(false);
       mp.setLayout(new FlowLayout());
-      mp.add(new Label("Font doesn't have letters defined\nso cannot be used\nwith alignment data."));
+      mp.add(new Label(
+              "Font doesn't have letters defined\nso cannot be used\nwith alignment data."));
       d.setMainPanel(mp);
       d.setVisible(true);
       return;
@@ -200,7 +204,7 @@ public class FontChooser extends Panel implements ActionListener,
       ap.fontChanged();
     }
     // remember last selected
-    lastSelected=newFont;
+    lastSelected = newFont;
   }
 
   protected void fontName_actionPerformed()