Formatting
[jalview.git] / src / jalview / appletgui / FontChooser.java
index 5f44b39..112e1d4 100755 (executable)
@@ -1,6 +1,6 @@
 /*\r
  * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
 package jalview.appletgui;\r
 \r
 import java.awt.*;\r
-\r
-import java.awt.event.ActionEvent;\r
-import java.awt.event.ItemEvent;\r
+import java.awt.event.*;\r
 \r
 public class FontChooser\r
-    extends Panel\r
+    extends Panel implements ActionListener, ItemListener\r
 {\r
   AlignmentPanel ap;\r
   TreePanel tp;\r
@@ -89,11 +87,39 @@ public class FontChooser
     Frame frame = new Frame();\r
     this.frame = frame;\r
     frame.add(this);\r
-    jalview.bin.JalviewLite.addFrame(frame, "Change Font", 440, 100);\r
+    jalview.bin.JalviewLite.addFrame(frame, "Change Font", 440, 115);\r
 \r
     init = false;\r
   }\r
 \r
+  public void actionPerformed(ActionEvent evt)\r
+  {\r
+    if (evt.getSource() == ok)\r
+    {\r
+      ok_actionPerformed();\r
+    }\r
+    else if (evt.getSource() == cancel)\r
+    {\r
+      cancel_actionPerformed();\r
+    }\r
+  }\r
+\r
+  public void itemStateChanged(ItemEvent evt)\r
+  {\r
+    if (evt.getSource() == fontName)\r
+    {\r
+      fontName_actionPerformed();\r
+    }\r
+    else if (evt.getSource() == fontSize)\r
+    {\r
+      fontSize_actionPerformed();\r
+    }\r
+    else if (evt.getSource() == fontStyle)\r
+    {\r
+      fontStyle_actionPerformed();\r
+    }\r
+  }\r
+\r
   protected void ok_actionPerformed()\r
   {\r
     frame.setVisible(false);\r
@@ -109,12 +135,12 @@ public class FontChooser
 \r
   protected void cancel_actionPerformed()\r
   {\r
-    if(ap!=null)\r
+    if (ap != null)\r
     {\r
       ap.av.setFont(oldFont);\r
       ap.repaint();\r
     }\r
-    else if(tp!=null)\r
+    else if (tp != null)\r
     {\r
       tp.setTreeFont(oldFont);\r
       tp.treeCanvas.repaint();\r
@@ -139,10 +165,10 @@ public class FontChooser
       ap.av.setFont(newFont);\r
       ap.fontChanged();\r
     }\r
-    else if(tp != null)\r
+    else if (tp != null)\r
     {\r
       tp.setTreeFont(newFont);\r
-      }\r
+    }\r
   }\r
 \r
   protected void fontName_actionPerformed()\r
@@ -171,6 +197,7 @@ public class FontChooser
     }\r
     changeFont();\r
   }\r
+\r
   Label label1 = new Label();\r
   protected Choice fontSize = new Choice();\r
   protected Choice fontStyle = new Choice();\r
@@ -189,72 +216,53 @@ public class FontChooser
   Panel panel5 = new Panel();\r
   BorderLayout borderLayout4 = new BorderLayout();\r
 \r
-\r
-  private void jbInit() throws Exception {\r
-      label1.setFont(new java.awt.Font("Verdana", 0, 11));\r
-      label1.setAlignment(Label.RIGHT);\r
-      label1.setText("Font: ");\r
-      this.setLayout(borderLayout4);\r
-      fontSize.setFont(new java.awt.Font("Verdana", 0, 11));\r
-      fontSize.addItemListener(new java.awt.event.ItemListener() {\r
-              public void itemStateChanged(ItemEvent e) {\r
-                  fontSize_actionPerformed();\r
-              }\r
-          });\r
-      fontStyle.setFont(new java.awt.Font("Verdana", 0, 11));\r
-      fontStyle.addItemListener(new java.awt.event.ItemListener() {\r
-              public void itemStateChanged(ItemEvent e) {\r
-                  fontStyle_actionPerformed();\r
-              }\r
-          });\r
-      label2.setAlignment(Label.RIGHT);\r
-      label2.setFont(new java.awt.Font("Verdana", 0, 11));\r
-      label2.setText("Size: ");\r
-      label3.setAlignment(Label.RIGHT);\r
-      label3.setFont(new java.awt.Font("Verdana", 0, 11));\r
-      label3.setText("Style: ");\r
-      fontName.setFont(new java.awt.Font("Verdana", 0, 11));\r
-      fontName.addItemListener(new java.awt.event.ItemListener() {\r
-              public void itemStateChanged(ItemEvent e) {\r
-                  fontName_actionPerformed();\r
-              }\r
-          });\r
-      ok.setFont(new java.awt.Font("Verdana", 0, 11));\r
-      ok.setLabel("OK");\r
-      ok.addActionListener(new java.awt.event.ActionListener() {\r
-              public void actionPerformed(ActionEvent e) {\r
-                  ok_actionPerformed();\r
-              }\r
-          });\r
-      cancel.setFont(new java.awt.Font("Verdana", 0, 11));\r
-      cancel.setLabel("Cancel");\r
-      cancel.addActionListener(new java.awt.event.ActionListener() {\r
-              public void actionPerformed(ActionEvent e) {\r
-                  cancel_actionPerformed();\r
-              }\r
-          });\r
-      this.setBackground(Color.white);\r
-      panel1.setLayout(borderLayout1);\r
-      panel2.setLayout(borderLayout3);\r
-      panel3.setLayout(borderLayout2);\r
-      panel5.setBackground(Color.white);\r
-      panel4.setBackground(Color.white);\r
-      panel1.setBackground(Color.white);\r
-      panel2.setBackground(Color.white);\r
-      panel3.setBackground(Color.white);\r
-      panel1.add(label1, BorderLayout.WEST);\r
-      panel1.add(fontName, BorderLayout.CENTER);\r
-      panel5.add(panel1, null);\r
-      panel5.add(panel3, null);\r
-      panel5.add(panel2, null);\r
-      panel2.add(label3, BorderLayout.WEST);\r
-      panel2.add(fontStyle, BorderLayout.CENTER);\r
-      panel3.add(label2, BorderLayout.WEST);\r
-      panel3.add(fontSize, BorderLayout.CENTER);\r
-      this.add(panel4, BorderLayout.SOUTH);\r
-      panel4.add(ok, null);\r
-      panel4.add(cancel, null);\r
-      this.add(panel5, BorderLayout.CENTER);\r
+  private void jbInit()\r
+      throws Exception\r
+  {\r
+    label1.setFont(new java.awt.Font("Verdana", 0, 11));\r
+    label1.setAlignment(Label.RIGHT);\r
+    label1.setText("Font: ");\r
+    this.setLayout(borderLayout4);\r
+    fontSize.setFont(new java.awt.Font("Verdana", 0, 11));\r
+    fontSize.addItemListener(this);\r
+    fontStyle.setFont(new java.awt.Font("Verdana", 0, 11));\r
+    fontStyle.addItemListener(this);\r
+    label2.setAlignment(Label.RIGHT);\r
+    label2.setFont(new java.awt.Font("Verdana", 0, 11));\r
+    label2.setText("Size: ");\r
+    label3.setAlignment(Label.RIGHT);\r
+    label3.setFont(new java.awt.Font("Verdana", 0, 11));\r
+    label3.setText("Style: ");\r
+    fontName.setFont(new java.awt.Font("Verdana", 0, 11));\r
+    fontName.addItemListener(this);\r
+    ok.setFont(new java.awt.Font("Verdana", 0, 11));\r
+    ok.setLabel("OK");\r
+    ok.addActionListener(this);\r
+    cancel.setFont(new java.awt.Font("Verdana", 0, 11));\r
+    cancel.setLabel("Cancel");\r
+    cancel.addActionListener(this);\r
+    this.setBackground(Color.white);\r
+    panel1.setLayout(borderLayout1);\r
+    panel2.setLayout(borderLayout3);\r
+    panel3.setLayout(borderLayout2);\r
+    panel5.setBackground(Color.white);\r
+    panel4.setBackground(Color.white);\r
+    panel1.setBackground(Color.white);\r
+    panel2.setBackground(Color.white);\r
+    panel3.setBackground(Color.white);\r
+    panel1.add(label1, BorderLayout.WEST);\r
+    panel1.add(fontName, BorderLayout.CENTER);\r
+    panel5.add(panel1, null);\r
+    panel5.add(panel3, null);\r
+    panel5.add(panel2, null);\r
+    panel2.add(label3, BorderLayout.WEST);\r
+    panel2.add(fontStyle, BorderLayout.CENTER);\r
+    panel3.add(label2, BorderLayout.WEST);\r
+    panel3.add(fontSize, BorderLayout.CENTER);\r
+    this.add(panel4, BorderLayout.SOUTH);\r
+    panel4.add(ok, null);\r
+    panel4.add(cancel, null);\r
+    this.add(panel5, BorderLayout.CENTER);\r
   }\r
 \r
 }\r