Reduced jar size by 20%

[jalview.git] / src / jalview / appletgui / FontChooser.java

diff --git a/src/jalview/appletgui/FontChooser.java b/src/jalview/appletgui/FontChooser.java
index 5f44b39..843ffe7 100755 (executable)
--- a/src/jalview/appletgui/FontChooser.java
+++ b/src/jalview/appletgui/FontChooser.java
@@ -21,11 +21,10 @@ package jalview.appletgui;
 \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 +88,30 @@ 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
+      ok_actionPerformed();\r
+    else if(evt.getSource()==cancel)\r
+      cancel_actionPerformed();\r
+  }\r
+\r
+  public void itemStateChanged(ItemEvent evt)\r
+  {\r
+    if(evt.getSource()==fontName)\r
+      fontName_actionPerformed();\r
+    else if(evt.getSource()==fontSize)\r
+      fontSize_actionPerformed();\r
+    else if(evt.getSource()==fontStyle)\r
+      fontStyle_actionPerformed();\r
+  }\r
+\r
+\r
   protected void ok_actionPerformed()\r
   {\r
     frame.setVisible(false);\r
@@ -196,17 +214,9 @@ public class FontChooser
       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
+      fontSize.addItemListener(this);\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
+      fontStyle.addItemListener(this);\r
       label2.setAlignment(Label.RIGHT);\r
       label2.setFont(new java.awt.Font("Verdana", 0, 11));\r
       label2.setText("Size: ");\r
@@ -214,25 +224,13 @@ public class FontChooser
       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
+      fontName.addItemListener(this);\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
+      ok.addActionListener(this);\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
+      cancel.addActionListener(this);\r
       this.setBackground(Color.white);\r
       panel1.setLayout(borderLayout1);\r
       panel2.setLayout(borderLayout3);\r