update author list in license for (JAL-826)

[jalview.git] / src / jalview / gui / FeatureColourChooser.java

diff --git a/src/jalview/gui/FeatureColourChooser.java b/src/jalview/gui/FeatureColourChooser.java
index e9a88ac..68052d0 100644 (file)
--- a/src/jalview/gui/FeatureColourChooser.java
+++ b/src/jalview/gui/FeatureColourChooser.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * 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
  * 
  * This file is part of Jalview.
  * 
@@ -29,10 +29,8 @@ import jalview.datamodel.*;
 import jalview.schemes.*;
 import java.awt.Dimension;
 
-public class FeatureColourChooser extends JPanel
+public class FeatureColourChooser extends JalviewDialog
 {
-  JDialog frame;
-
   // FeatureSettings fs;
   FeatureRenderer fr;
 
@@ -77,12 +75,7 @@ public class FeatureColourChooser extends JPanel
     this.fr = frender;
     this.type = type;
     ap = fr.ap;
-    frame = new JDialog(Desktop.instance, true);
-    frame.setTitle("Graduated Feature Colour for " + type);
-    Rectangle deskr = Desktop.instance.getBounds();
-    frame.setBounds(new Rectangle((int) (deskr.getCenterX() - 240),
-            (int) (deskr.getCenterY() - 92), 480, 185));
-    frame.setContentPane(this);
+    initDialogFrame(this,true, block,"Graduated Feature Colour for " + type, 480, 185);
     // frame.setLayer(JLayeredPane.PALETTE_LAYER);
     // Desktop.addInternalFrame(frame, "Graduated Feature Colour for "+type,
     // 480, 145);
@@ -167,22 +160,7 @@ public class FeatureColourChooser extends JPanel
     adjusting = false;
 
     changeColour();
-    if (!block)
-    {
-      new Thread(new Runnable()
-      {
-
-        public void run()
-        {
-          frame.show();
-        }
-
-      }).start();
-    }
-    else
-    {
-      frame.show();
-    }
+    waitForInput();
   }
 
   public FeatureColourChooser()
@@ -199,7 +177,7 @@ public class FeatureColourChooser extends JPanel
   private void jbInit() throws Exception
   {
 
-    minColour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
+    minColour.setFont(JvSwingUtils.getLabelFont());
     minColour.setBorder(BorderFactory.createLineBorder(Color.black));
     minColour.setPreferredSize(new Dimension(40, 20));
     minColour.setToolTipText("Minimum Colour");
@@ -213,7 +191,7 @@ public class FeatureColourChooser extends JPanel
         }
       }
     });
-    maxColour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
+    maxColour.setFont(JvSwingUtils.getLabelFont());
     maxColour.setBorder(BorderFactory.createLineBorder(Color.black));
     maxColour.setPreferredSize(new Dimension(40, 20));
     maxColour.setToolTipText("Maximum Colour");
@@ -229,27 +207,9 @@ public class FeatureColourChooser extends JPanel
     });
     maxColour.setBorder(new LineBorder(Color.black));
     minText.setText("Min:");
-    minText.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
+    minText.setFont(JvSwingUtils.getLabelFont());
     maxText.setText("Max:");
-    maxText.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
-    ok.setOpaque(false);
-    ok.setText("OK");
-    ok.addActionListener(new ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        ok_actionPerformed(e);
-      }
-    });
-    cancel.setOpaque(false);
-    cancel.setText("Cancel");
-    cancel.addActionListener(new ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        cancel_actionPerformed(e);
-      }
-    });
+    maxText.setFont(JvSwingUtils.getLabelFont());
     this.setLayout(borderLayout1);
     jPanel2.setLayout(flowLayout1);
     jPanel1.setBackground(Color.white);
@@ -331,10 +291,6 @@ public class FeatureColourChooser extends JPanel
 
   JPanel maxColour = new JPanel();
 
-  JButton ok = new JButton();
-
-  JButton cancel = new JButton();
-
   JPanel colourPanel = new JPanel();
 
   JPanel jPanel1 = new JPanel();
@@ -503,7 +459,7 @@ public class FeatureColourChooser extends JPanel
     ap.paintAlignment(false);
   }
 
-  private void raiseClosed()
+  protected void raiseClosed()
   {
     if (this.colourEditor != null)
     {
@@ -511,29 +467,15 @@ public class FeatureColourChooser extends JPanel
     }
   }
 
-  public void ok_actionPerformed(ActionEvent e)
+  public void okPressed()
   {
     changeColour();
-    try
-    {
-      frame.dispose();
-      raiseClosed();
-    } catch (Exception ex)
-    {
-    }
   }
 
-  public void cancel_actionPerformed(ActionEvent e)
+
+  public void cancelPressed()
   {
     reset();
-    try
-    {
-      frame.dispose();
-      // frame.setClosed(true);
-      raiseClosed();
-    } catch (Exception ex)
-    {
-    }
   }
 
   void reset()