JAL-3210 Improvements to eclipse detection. New src tree and SwingJS updated from...

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

diff --git a/src/jalview/gui/IdwidthAdjuster.java b/src/jalview/gui/IdwidthAdjuster.java
index 0c03db1..2c273ad 100755 (executable)
--- a/src/jalview/gui/IdwidthAdjuster.java
+++ b/src/jalview/gui/IdwidthAdjuster.java
@@ -23,11 +23,9 @@ package jalview.gui;
 import jalview.api.AlignViewportI;
 
 import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Image;
+import java.awt.Cursor;
+import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionListener;
 
 import javax.swing.JPanel;
 
@@ -37,161 +35,77 @@ import javax.swing.JPanel;
  * @author $author$
  * @version $Revision$
  */
-public class IdwidthAdjuster extends JPanel implements MouseListener,
-        MouseMotionListener
+@SuppressWarnings("serial")
+public class IdwidthAdjuster extends JPanel
 {
-  boolean active = false;
 
   int oldX = 0;
 
-  Image image;
-
-  AlignmentPanel ap;
-
   /**
-   * Creates a new IdwidthAdjuster object.
+   * Creates a new IdwidthAdjuster object above the id panel that can be dragged
+   * to change the panel's width
    * 
    * @param ap
-   *          DOCUMENT ME!
+   *          The associated AlignmentPanel
+   * 
    */
   public IdwidthAdjuster(AlignmentPanel ap)
   {
-    this.ap = ap;
-
-    java.net.URL url = getClass().getResource("/images/idwidth.gif");
+    // BH 2019.07.01 no need for overridden paintComponent, especially as it was
+    // overriding paint(g) so
+    // allowing strange component painting in its place.
 
-    if (url != null)
-    {
-      image = java.awt.Toolkit.getDefaultToolkit().createImage(url);
-    }
+    setBackground(Color.white);
+    setOpaque(true);
 
-    addMouseListener(this);
-    addMouseMotionListener(this);
-  }
+    setCursor(Cursor.getPredefinedCursor(Cursor.W_RESIZE_CURSOR));
 
-  /**
-   * DOCUMENT ME!
-   * 
-   * @param evt
-   *          DOCUMENT ME!
-   */
-  public void mousePressed(MouseEvent evt)
-  {
-    oldX = evt.getX();
-  }
+    // BH 2019.07.01 MouseAdapter is cleaner - no need for fields active or ap
 
-  /**
-   * DOCUMENT ME!
-   * 
-   * @param evt
-   *          DOCUMENT ME!
-   */
-  public void mouseReleased(MouseEvent evt)
-  {
-    active = false;
-    repaint();
-
-    /*
-     * If in a SplitFrame with co-scaled alignments, set the other's id width to
-     * match
-     */
-    final AlignViewportI viewport = ap.getAlignViewport();
-    if (viewport.getCodingComplement() != null
-            && viewport.isScaleProteinAsCdna())
+    MouseAdapter ma = (new MouseAdapter()
     {
-      viewport.getCodingComplement().setIdWidth(viewport.getIdWidth());
-      SplitFrame sf = (SplitFrame) ap.alignFrame.getSplitViewContainer();
-      sf.repaint();
-    }
-
-  }
-
-  /**
-   * DOCUMENT ME!
-   * 
-   * @param evt
-   *          DOCUMENT ME!
-   */
-  public void mouseEntered(MouseEvent evt)
-  {
-    active = true;
-    repaint();
-  }
-
-  /**
-   * DOCUMENT ME!
-   * 
-   * @param evt
-   *          DOCUMENT ME!
-   */
-  public void mouseExited(MouseEvent evt)
-  {
-    active = false;
-    repaint();
-  }
-
-  /**
-   * DOCUMENT ME!
-   * 
-   * @param evt
-   *          DOCUMENT ME!
-   */
-  public void mouseDragged(MouseEvent evt)
-  {
-    active = true;
-
-    final AlignViewportI viewport = ap.getAlignViewport();
-    int curwidth = viewport.getIdWidth();
-    int dif = evt.getX() - oldX;
-
-    final int newWidth = curwidth + dif;
-    if ((newWidth > 20) || (dif > 0))
-    {
-      viewport.setIdWidth(newWidth);
-
-      ap.paintAlignment(true);
-    }
+      @Override
+      public void mousePressed(MouseEvent evt)
+      {
+        oldX = evt.getX();
+      }
 
-    oldX = evt.getX();
-  }
+      @Override
+      public void mouseDragged(MouseEvent evt)
+      {
+        AlignViewportI viewport = ap.getAlignViewport();
+        int curwidth = viewport.getIdWidth();
+        int dif = evt.getX() - oldX;
+        int newWidth = curwidth + dif;
+        if ((newWidth > 20) || (dif > 0))
+        {
+          viewport.setIdWidth(newWidth);
+          ap.paintAlignment(true, false);
+        }
+        oldX = evt.getX();
+      }
 
-  /**
-   * DOCUMENT ME!
-   * 
-   * @param evt
-   *          DOCUMENT ME!
-   */
-  public void mouseMoved(MouseEvent evt)
-  {
-  }
+      @Override
+      public void mouseReleased(MouseEvent evt)
+      {
 
-  /**
-   * DOCUMENT ME!
-   * 
-   * @param evt
-   *          DOCUMENT ME!
-   */
-  public void mouseClicked(MouseEvent evt)
-  {
-  }
+        // If in a SplitFrame with co-scaled alignments, set the other's id
+        // width to match
 
-  /**
-   * DOCUMENT ME!
-   * 
-   * @param g
-   *          DOCUMENT ME!
-   */
-  public void paintComponent(Graphics g)
-  {
-    g.setColor(Color.white);
-    g.fillRect(0, 0, getWidth(), getHeight());
+        AlignViewportI viewport = ap.getAlignViewport();
+        if (viewport.getCodingComplement() != null
+                && viewport.isScaleProteinAsCdna())
+        {
+          viewport.getCodingComplement().setIdWidth(viewport.getIdWidth());
+          SplitFrame sf = (SplitFrame) ap.alignFrame
+                  .getSplitViewContainer();
+          sf.repaint();
+        }
 
-    if (active)
-    {
-      if (image != null)
-      {
-        g.drawImage(image, getWidth() - 20, 2, this);
       }
-    }
+
+    });
+    addMouseListener(ma);
+    addMouseMotionListener(ma);
   }
 }