updated to jalview 2.1 and begun ArchiveClient/VamsasClient/VamsasStore updates.
[jalview.git] / src / jalview / gui / AlignmentPanel.java
index 19f50d0..c2df433 100755 (executable)
-/*\r
- * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 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
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
- */\r
-package jalview.gui;\r
-\r
-import jalview.datamodel.*;\r
-\r
-import jalview.jbgui.*;\r
-\r
-import jalview.schemes.*;\r
-\r
-import org.jibble.epsgraphics.*;\r
-\r
-import java.awt.*;\r
-import java.awt.event.*;\r
-import java.awt.image.*;\r
-import java.awt.print.*;\r
-\r
-import java.io.*;\r
-\r
-import javax.imageio.*;\r
-\r
-import javax.swing.*;\r
-\r
-\r
-/**\r
- * DOCUMENT ME!\r
- *\r
- * @author $author$\r
- * @version $Revision$\r
- */\r
-public class AlignmentPanel extends GAlignmentPanel\r
-    implements AdjustmentListener, Printable\r
-{\r
-    AlignViewport av;\r
-    OverviewPanel overviewPanel;\r
-    SeqPanel seqPanel;\r
-    IdPanel idPanel;\r
-    IdwidthAdjuster idwidthAdjuster;\r
-\r
-    /** DOCUMENT ME!! */\r
-    public AlignFrame alignFrame;\r
-    ScalePanel scalePanel;\r
-    AnnotationPanel annotationPanel;\r
-    AnnotationLabels alabels;\r
-\r
-    // this value is set false when selection area being dragged\r
-    boolean fastPaint = true;\r
-    int hextent = 0;\r
-    int vextent = 0;\r
-\r
-    /**\r
-     * Creates a new AlignmentPanel object.\r
-     *\r
-     * @param af DOCUMENT ME!\r
-     * @param av DOCUMENT ME!\r
-     */\r
-    public AlignmentPanel(AlignFrame af, final AlignViewport av)\r
-    {\r
-        alignFrame = af;\r
-        this.av = av;\r
-        seqPanel = new SeqPanel(av, this);\r
-        idPanel = new IdPanel(av, this);\r
-\r
-        scalePanel = new ScalePanel(av, this);\r
-\r
-        idPanelHolder.add(idPanel, BorderLayout.CENTER);\r
-        idwidthAdjuster = new IdwidthAdjuster(this);\r
-        idSpaceFillerPanel1.add(idwidthAdjuster, BorderLayout.CENTER);\r
-\r
-        annotationPanel = new AnnotationPanel(this);\r
-        alabels = new AnnotationLabels(this);\r
-\r
-        annotationSpaceFillerHolder.setPreferredSize(annotationPanel.getPreferredSize());\r
-        annotationScroller.setPreferredSize(annotationPanel.getPreferredSize());\r
-        annotationScroller.setViewportView(annotationPanel);\r
-        annotationSpaceFillerHolder.add(alabels, BorderLayout.CENTER);\r
-\r
-        fontChanged();\r
-\r
-        scalePanelHolder.add(scalePanel, BorderLayout.CENTER);\r
-        seqPanelHolder.add(seqPanel, BorderLayout.CENTER);\r
-\r
-        setScrollValues(0, 0);\r
-\r
-        hscroll.addAdjustmentListener(this);\r
-        vscroll.addAdjustmentListener(this);\r
-\r
-        setFocusable(true);\r
-        addKeyListener(new KeyAdapter()\r
-            {\r
-                public void keyPressed(KeyEvent evt)\r
-                {\r
-                    switch (evt.getKeyCode())\r
-                    {\r
-                    case 27: // escape key\r
-                        av.setSelectionGroup(null);\r
-                        repaint();\r
-\r
-                        break;\r
-\r
-                    case KeyEvent.VK_DOWN:\r
-                        alignFrame.moveSelectedSequences(false);\r
-\r
-                        break;\r
-\r
-                    case KeyEvent.VK_UP:\r
-                        alignFrame.moveSelectedSequences(true);\r
-\r
-                        break;\r
-\r
-                    case KeyEvent.VK_BACK_SPACE:\r
-                    case KeyEvent.VK_DELETE:\r
-                      alignFrame.cut_actionPerformed(null);\r
-                      break;\r
-                    }\r
-\r
-                }\r
-            });\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     */\r
-    public void fontChanged()\r
-    {\r
-        // set idCanvas bufferedImage to null\r
-        // to prevent drawing old image\r
-        FontMetrics fm = getFontMetrics(av.getFont());\r
-\r
-        scalePanelHolder.setPreferredSize(new Dimension(10,\r
-                av.charHeight + fm.getDescent()));\r
-        idSpaceFillerPanel1.setPreferredSize(new Dimension(10,\r
-                av.charHeight + fm.getDescent()));\r
-\r
-        idPanel.idCanvas.gg = null;\r
-        seqPanel.seqCanvas.img = null;\r
-        annotationPanel.adjustPanelHeight();\r
-\r
-        Dimension d = calculateIdWidth();\r
-        d.setSize(d.width + 4, d.height);\r
-        idPanel.idCanvas.setPreferredSize(d);\r
-        hscrollFillerPanel.setPreferredSize(d);\r
-\r
-        if (av.getWrapAlignment())\r
-        {\r
-          int max = av.alignment.getWidth() /\r
-              seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());\r
-          vscroll.setMaximum(max);\r
-          vscroll.setUnitIncrement(1);\r
-          vscroll.setVisibleAmount(1);\r
-        }\r
-        else\r
-        {\r
-          setScrollValues(av.getStartRes(), av.getStartSeq());\r
-        }\r
-\r
-        if(overviewPanel!=null)\r
-          overviewPanel.setBoxPosition();\r
-\r
-        repaint();\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @return DOCUMENT ME!\r
-     */\r
-    public Dimension calculateIdWidth()\r
-    {\r
-      Container c = new Container();\r
-\r
-        FontMetrics fm = c.getFontMetrics(av.font);\r
-        AlignmentI al = av.getAlignment();\r
-\r
-        int i = 0;\r
-        int idWidth = 0;\r
-        String id;\r
-\r
-        while ((i < al.getHeight()) && (al.getSequenceAt(i) != null))\r
-        {\r
-            SequenceI s = al.getSequenceAt(i);\r
-\r
-            if (av.getShowFullId())\r
-            {\r
-                id = s.getDisplayId();\r
-            }\r
-            else\r
-            {\r
-                id = s.getName();\r
-            }\r
-\r
-            if (fm.stringWidth(id) > idWidth)\r
-            {\r
-                idWidth = fm.stringWidth(id);\r
-            }\r
-\r
-            i++;\r
-        }\r
-\r
-        // Also check annotation label widths\r
-        i = 0;\r
-\r
-        if (al.getAlignmentAnnotation() != null)\r
-        {\r
-            fm = c.getFontMetrics(alabels.getFont());\r
-\r
-            while (i < al.getAlignmentAnnotation().length)\r
-            {\r
-                String label = al.getAlignmentAnnotation()[i].label;\r
-\r
-                if (fm.stringWidth(label) > idWidth)\r
-                {\r
-                    idWidth = fm.stringWidth(label);\r
-                }\r
-\r
-                i++;\r
-            }\r
-        }\r
-\r
-        return new Dimension(idWidth, 12);\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param results DOCUMENT ME!\r
-     */\r
-    public void highlightSearchResults(int[] results)\r
-    {\r
-        seqPanel.seqCanvas.highlightSearchResults(results);\r
-\r
-        // do we need to scroll the panel?\r
-        if (results != null)\r
-        {\r
-            SequenceI seq = av.alignment.getSequenceAt(results[0]);\r
-            int start = seq.findIndex(results[1]) - 1;\r
-            int end = seq.findIndex(results[2]) - 1;\r
-\r
-            if ((av.getStartRes() > start) || (av.getEndRes() < end) ||\r
-                    ((av.getStartSeq() > results[0]) ||\r
-                    (av.getEndSeq() < results[0])))\r
-            {\r
-                setScrollValues(start, results[0]);\r
-            }\r
-        }\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @return DOCUMENT ME!\r
-     */\r
-    public OverviewPanel getOverviewPanel()\r
-    {\r
-        return overviewPanel;\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param op DOCUMENT ME!\r
-     */\r
-    public void setOverviewPanel(OverviewPanel op)\r
-    {\r
-        overviewPanel = op;\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param b DOCUMENT ME!\r
-     */\r
-    public void setAnnotationVisible(boolean b)\r
-    {\r
-        annotationSpaceFillerHolder.setVisible(b);\r
-        annotationScroller.setVisible(b);\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param wrap DOCUMENT ME!\r
-     */\r
-    public void setWrapAlignment(boolean wrap)\r
-    {\r
-        av.startSeq = 0;\r
-        scalePanelHolder.setVisible(!wrap);\r
-        hscroll.setVisible(!wrap);\r
-        idwidthAdjuster.setVisible(!wrap);\r
-\r
-        av.setShowAnnotation(!wrap);\r
-        annotationScroller.setVisible(!wrap);\r
-        annotationSpaceFillerHolder.setVisible(!wrap);\r
-        idSpaceFillerPanel1.setVisible(!wrap);\r
-\r
-        repaint();\r
-    }\r
-\r
-\r
-    // return value is true if the scroll is valid\r
-    public boolean scrollUp(boolean up)\r
-    {\r
-        if (up)\r
-        {\r
-            if (vscroll.getValue() < 1)\r
-            {\r
-                return false;\r
-            }\r
-\r
-            fastPaint = false;\r
-            vscroll.setValue(vscroll.getValue() - 1);\r
-        }\r
-        else\r
-        {\r
-            if ((vextent + vscroll.getValue()) >= av.getAlignment().getHeight())\r
-            {\r
-                return false;\r
-            }\r
-\r
-            fastPaint = false;\r
-            vscroll.setValue(vscroll.getValue() + 1);\r
-        }\r
-\r
-        fastPaint = true;\r
-\r
-        return true;\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param right DOCUMENT ME!\r
-     *\r
-     * @return DOCUMENT ME!\r
-     */\r
-    public boolean scrollRight(boolean right)\r
-    {\r
-        if (right)\r
-        {\r
-            if (hscroll.getValue() < 1)\r
-            {\r
-                return false;\r
-            }\r
-\r
-            fastPaint = false;\r
-            hscroll.setValue(hscroll.getValue() - 1);\r
-        }\r
-        else\r
-        {\r
-            if ((hextent + hscroll.getValue()) >= av.getAlignment().getWidth())\r
-            {\r
-                return false;\r
-            }\r
-\r
-            fastPaint = false;\r
-            hscroll.setValue(hscroll.getValue() + 1);\r
-        }\r
-\r
-        fastPaint = true;\r
-\r
-        return true;\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param x DOCUMENT ME!\r
-     * @param y DOCUMENT ME!\r
-     */\r
-    public void setScrollValues(int x, int y)\r
-    {\r
-        av.setEndRes((x + (seqPanel.seqCanvas.getWidth() / av.getCharWidth())) -\r
-            1);\r
-\r
-        hextent = seqPanel.seqCanvas.getWidth() / av.charWidth;\r
-        vextent = seqPanel.seqCanvas.getHeight() / av.charHeight;\r
-\r
-        if (hextent > av.alignment.getWidth())\r
-        {\r
-            hextent = av.alignment.getWidth();\r
-        }\r
-\r
-        if (vextent > av.alignment.getHeight())\r
-        {\r
-            vextent = av.alignment.getHeight();\r
-        }\r
-\r
-        if ((hextent + x) > av.getAlignment().getWidth())\r
-        {\r
-            x = av.getAlignment().getWidth() - hextent;\r
-        }\r
-\r
-        if ((vextent + y) > av.getAlignment().getHeight())\r
-        {\r
-            y = av.getAlignment().getHeight() - vextent;\r
-        }\r
-\r
-        if (y < 0)\r
-        {\r
-            y = 0;\r
-        }\r
-\r
-        if (x < 0)\r
-        {\r
-            x = 0;\r
-        }\r
-\r
-        hscroll.setValues(x, hextent, 0, av.getAlignment().getWidth());\r
-        vscroll.setValues(y, vextent, 0, av.getAlignment().getHeight());\r
-    }\r
-\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param evt DOCUMENT ME!\r
-     */\r
-    public void adjustmentValueChanged(AdjustmentEvent evt)\r
-    {\r
-        int oldX = av.getStartRes();\r
-        int oldY = av.getStartSeq();\r
-\r
-        if (evt.getSource() == hscroll)\r
-        {\r
-            int x = hscroll.getValue();\r
-            av.setStartRes(x);\r
-            av.setEndRes((x +\r
-                (seqPanel.seqCanvas.getWidth() / av.getCharWidth())) - 1);\r
-        }\r
-\r
-        if (evt.getSource() == vscroll)\r
-        {\r
-            int offy = vscroll.getValue();\r
-\r
-            if (av.getWrapAlignment())\r
-            {\r
-                int rowSize = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());\r
-                av.setStartRes(vscroll.getValue() * rowSize);\r
-                av.setEndRes((vscroll.getValue() + 1) * rowSize);\r
-            }\r
-            else\r
-            {\r
-                av.setStartSeq(offy);\r
-                av.setEndSeq(offy +\r
-                    (seqPanel.seqCanvas.getHeight() / av.getCharHeight()));\r
-            }\r
-        }\r
-\r
-        if (overviewPanel != null)\r
-        {\r
-            overviewPanel.setBoxPosition();\r
-        }\r
-\r
-        if (av.getWrapAlignment() || !fastPaint)\r
-        {\r
-            repaint();\r
-        }\r
-        else\r
-        {\r
-            idPanel.idCanvas.fastPaint(av.getStartSeq() - oldY);\r
-            seqPanel.seqCanvas.fastPaint(av.getStartRes() - oldX,\r
-                av.getStartSeq() - oldY);\r
-\r
-            scalePanel.repaint();\r
-\r
-            if (av.getShowAnnotation())\r
-            {\r
-                annotationPanel.fastPaint(av.getStartRes() - oldX);\r
-            }\r
-        }\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param g DOCUMENT ME!\r
-     */\r
-    public void paintComponent(Graphics g)\r
-    {\r
-        invalidate();\r
-\r
-        Dimension d = idPanel.idCanvas.getPreferredSize();\r
-        idPanelHolder.setPreferredSize(d);\r
-        hscrollFillerPanel.setPreferredSize(new Dimension(d.width, 12));\r
-        validate();\r
-\r
-        if (av.getWrapAlignment())\r
-        {\r
-            int max = av.alignment.getWidth() / seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());\r
-            vscroll.setMaximum(max);\r
-            vscroll.setUnitIncrement(1);\r
-            vscroll.setVisibleAmount(1);\r
-        }\r
-        else\r
-        {\r
-            setScrollValues(av.getStartRes(), av.getStartSeq());\r
-        }\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param pg DOCUMENT ME!\r
-     * @param pf DOCUMENT ME!\r
-     * @param pi DOCUMENT ME!\r
-     *\r
-     * @return DOCUMENT ME!\r
-     *\r
-     * @throws PrinterException DOCUMENT ME!\r
-     */\r
-    public int print(Graphics pg, PageFormat pf, int pi)\r
-        throws PrinterException\r
-    {\r
-        pg.translate((int) pf.getImageableX(), (int) pf.getImageableY());\r
-\r
-        int pwidth = (int) pf.getImageableWidth();\r
-        int pheight = (int) pf.getImageableHeight();\r
-\r
-        if (av.getWrapAlignment())\r
-        {\r
-            return printWrappedAlignment(pg, pwidth, pheight, pi);\r
-        }\r
-        else\r
-        {\r
-            return printUnwrapped(pg, pwidth, pheight, pi);\r
-        }\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param pg DOCUMENT ME!\r
-     * @param pwidth DOCUMENT ME!\r
-     * @param pheight DOCUMENT ME!\r
-     * @param pi DOCUMENT ME!\r
-     *\r
-     * @return DOCUMENT ME!\r
-     *\r
-     * @throws PrinterException DOCUMENT ME!\r
-     */\r
-    public int printUnwrapped(Graphics pg, int pwidth, int pheight, int pi)\r
-        throws PrinterException\r
-    {\r
-        int idWidth = calculateIdWidth().width + 4;\r
-        FontMetrics fm = getFontMetrics(av.getFont());\r
-        int scaleHeight = av.charHeight + fm.getDescent();\r
-\r
-        pg.setColor(Color.white);\r
-        pg.fillRect(0, 0, pwidth, pheight);\r
-        pg.setFont(av.getFont());\r
-\r
-        ////////////////////////////////////\r
-        /// How many sequences and residues can we fit on a printable page?\r
-        int totalRes = (pwidth - idWidth) / av.getCharWidth();\r
-\r
-        int totalSeq = (int) ((pheight - scaleHeight) / av.getCharHeight()) -\r
-            1;\r
-\r
-        int pagesWide = (av.getAlignment().getWidth() / totalRes) + 1;\r
-\r
-        /////////////////////////////\r
-        /// Only print these sequences and residues on this page\r
-        int startRes;\r
-\r
-        /////////////////////////////\r
-        /// Only print these sequences and residues on this page\r
-        int endRes;\r
-\r
-        /////////////////////////////\r
-        /// Only print these sequences and residues on this page\r
-        int startSeq;\r
-\r
-        /////////////////////////////\r
-        /// Only print these sequences and residues on this page\r
-        int endSeq;\r
-        startRes = (pi % pagesWide) * totalRes;\r
-        endRes = (startRes + totalRes) - 1;\r
-\r
-        if (endRes > (av.getAlignment().getWidth() - 1))\r
-        {\r
-            endRes = av.getAlignment().getWidth() - 1;\r
-        }\r
-\r
-        startSeq = (pi / pagesWide) * totalSeq;\r
-        endSeq = startSeq + totalSeq;\r
-\r
-        if (endSeq > av.getAlignment().getHeight())\r
-        {\r
-            endSeq = av.getAlignment().getHeight();\r
-        }\r
-\r
-        int pagesHigh = ((av.alignment.getHeight() / totalSeq) + 1) * pheight;\r
-\r
-        if (av.showAnnotation)\r
-        {\r
-            pagesHigh += annotationPanel.getHeight();\r
-        }\r
-\r
-        pagesHigh /= pheight;\r
-\r
-        if (pi >= (pagesWide * pagesHigh))\r
-        {\r
-            return Printable.NO_SUCH_PAGE;\r
-        }\r
-\r
-        //draw Scale\r
-        pg.translate(idWidth, 0);\r
-        scalePanel.drawScale(pg, startRes, endRes, pwidth - idWidth, scaleHeight);\r
-        pg.translate(-idWidth, scaleHeight);\r
-\r
-        ////////////////\r
-        // Draw the ids\r
-        Color currentColor = null;\r
-        Color currentTextColor = null;\r
-\r
-        for (int i = startSeq; i < endSeq; i++)\r
-        {\r
-            if ((av.getSelectionGroup() != null) &&\r
-                    av.getSelectionGroup().sequences.contains(\r
-                        av.getAlignment().getSequenceAt(i)))\r
-            {\r
-                currentColor = Color.gray;\r
-                currentTextColor = Color.black;\r
-            }\r
-            else\r
-            {\r
-                currentColor = av.getAlignment().getSequenceAt(i).getColor();\r
-                currentTextColor = Color.black;\r
-            }\r
-\r
-            pg.setColor(currentColor);\r
-            pg.fillRect(0, (i-startSeq) * av.charHeight, idWidth,\r
-                av.getCharHeight());\r
-\r
-            pg.setColor(currentTextColor);\r
-\r
-            String string = av.getAlignment().getSequenceAt(i).getName();\r
-\r
-            if (av.getShowFullId())\r
-            {\r
-                string = av.getAlignment().getSequenceAt(i).getDisplayId();\r
-            }\r
-\r
-            pg.drawString(string, 0,\r
-                (((i-startSeq) * av.charHeight) + av.getCharHeight()) -\r
-                (av.getCharHeight() / 5));\r
-        }\r
-\r
-        // draw main sequence panel\r
-        pg.translate(idWidth, 0);\r
-        seqPanel.seqCanvas.drawPanel(pg, startRes, endRes, startSeq, endSeq,\r
-            startRes, startSeq, 0);\r
-\r
-        if (av.showAnnotation && (endSeq == av.alignment.getHeight()))\r
-        {\r
-            pg.translate(-idWidth, (endSeq - startSeq) * av.charHeight);\r
-            alabels.drawComponent((Graphics2D) pg);\r
-            pg.translate(idWidth, 0);\r
-            annotationPanel.drawComponent((Graphics2D) pg, startRes, endRes +\r
-                1);\r
-        }\r
-\r
-        return Printable.PAGE_EXISTS;\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param pg DOCUMENT ME!\r
-     * @param pwidth DOCUMENT ME!\r
-     * @param pheight DOCUMENT ME!\r
-     * @param pi DOCUMENT ME!\r
-     *\r
-     * @return DOCUMENT ME!\r
-     *\r
-     * @throws PrinterException DOCUMENT ME!\r
-     */\r
-    public int printWrappedAlignment(Graphics pg, int pwidth, int pheight,\r
-        int pi) throws PrinterException\r
-    {\r
-        int idWidth = calculateIdWidth().width + 4;\r
-\r
-        int resWidth = seqPanel.seqCanvas.getWrappedCanvasWidth(pwidth -\r
-                idWidth);\r
-        int totalHeight = totalHeight = (av.alignment.getHeight() + 2) * ((av.alignment.getWidth() / resWidth) +\r
-                1) * av.charHeight;\r
-\r
-        pg.setColor(Color.white);\r
-        pg.fillRect(0, 0, pwidth, pheight);\r
-        pg.setFont(av.getFont());\r
-\r
-        ////////////////\r
-        // Draw the ids\r
-        pg.setColor(Color.black);\r
-\r
-        pg.translate(0, -pi * pheight);\r
-\r
-        pg.setClip(0, pi * pheight, pwidth, pheight);\r
-\r
-        int ypos = 2 * av.charHeight;\r
-\r
-        do\r
-        {\r
-            for (int i = 0; i < av.alignment.getHeight(); i++)\r
-            {\r
-                SequenceI s = av.alignment.getSequenceAt(i);\r
-                String string = s.getName();\r
-\r
-                if (av.getShowFullId())\r
-                {\r
-                    string = s.getDisplayId();\r
-                }\r
-\r
-                pg.drawString(string, 0,\r
-                    ((i * av.charHeight) + ypos + av.charHeight) -\r
-                    (av.charHeight / 5));\r
-            }\r
-\r
-            ypos += ((av.alignment.getHeight() + 2) * av.charHeight);\r
-        }\r
-        while (ypos < totalHeight);\r
-\r
-        pg.translate(idWidth, 0);\r
-\r
-        seqPanel.seqCanvas.drawWrappedPanel(pg, pwidth - idWidth, totalHeight, 0);\r
-\r
-        if ((pi * pheight) < totalHeight)\r
-        {\r
-            return Printable.PAGE_EXISTS;\r
-        }\r
-        else\r
-        {\r
-            return Printable.NO_SUCH_PAGE;\r
-        }\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     */\r
-    public void makeEPS(File epsFile)\r
-    {\r
-        if(epsFile == null)\r
-        {\r
-          jalview.io.JalviewFileChooser chooser = new jalview.io.\r
-              JalviewFileChooser(jalview.bin.Cache.getProperty(\r
-                  "LAST_DIRECTORY"), new String[]\r
-                                 {"eps"},\r
-                                 new String[]\r
-                                 {"Encapsulated Postscript"},\r
-                                 "Encapsulated Postscript");\r
-          chooser.setFileView(new jalview.io.JalviewFileView());\r
-          chooser.setDialogTitle("Create EPS file from alignment");\r
-          chooser.setToolTipText("Save");\r
-\r
-          int value = chooser.showSaveDialog(this);\r
-\r
-          if (value != jalview.io.JalviewFileChooser.APPROVE_OPTION)\r
-          {\r
-            return;\r
-          }\r
-\r
-          epsFile = chooser.getSelectedFile();\r
-\r
-          jalview.bin.Cache.setProperty("LAST_DIRECTORY",\r
-                                        chooser.getSelectedFile().getParent());\r
-        }\r
-\r
-        int height = ( (av.alignment.getHeight() + 1) * av.charHeight) + 30;\r
-        int width = idPanel.getWidth() + (av.alignment.getWidth() * av.charWidth);\r
-\r
-        if (av.getWrapAlignment())\r
-        {\r
-          height = ( (av.alignment.getWidth() / av.getChunkWidth()) + 1) *\r
-              av.chunkHeight;\r
-          width = seqPanel.getWidth() + idPanel.getWidth();\r
-\r
-        }\r
-\r
-\r
-        if (av.getShowAnnotation())\r
-        {\r
-            height += annotationPanel.getPreferredSize().height;\r
-        }\r
-\r
-        try\r
-         {\r
-            FileOutputStream out = new FileOutputStream(epsFile);\r
-            EpsGraphics2D pg = new EpsGraphics2D("Example", out, 0, 0, width,\r
-                    height);\r
-\r
-            if (av.getWrapAlignment())\r
-            {\r
-                printWrappedAlignment(pg, width, height, 0);\r
-            }\r
-            else\r
-            {\r
-                printUnwrapped(pg, width, height, 0);\r
-            }\r
-\r
-            pg.flush();\r
-            pg.close();\r
-        }\r
-        catch (Exception ex)\r
-        {\r
-            ex.printStackTrace();\r
-        }\r
-    }\r
-\r
-\r
-    public void makePNGImageMap(File imgMapFile, String imageName)\r
-    {\r
-      ///////ONLY WORKS WITH NONE WRAPPED ALIGNMENTS\r
-      //////////////////////////////////////////////\r
-      int idWidth = calculateIdWidth().width + 4;\r
-      FontMetrics fm = getFontMetrics(av.getFont());\r
-      int scaleHeight = av.charHeight + fm.getDescent();\r
-\r
-        // Gen image map\r
-         //////////////////////////////////\r
-         if(imgMapFile!=null)\r
-         {\r
-           try\r
-           {\r
-             PrintWriter out = new PrintWriter(new FileWriter(imgMapFile));\r
-             out.println(jalview.io.HTMLOutput.getImageMapHTML());\r
-             out.println("<img src=\"" + imageName +\r
-                       "\" border=\"0\" usemap=\"#Map\" >"\r
-                       +"<map name=\"Map\">");\r
-\r
-             for (int s = 0; s < av.alignment.getHeight(); s++)\r
-             {\r
-               SequenceI seq = av.alignment.getSequenceAt(s);\r
-               SequenceGroup[] groups = av.alignment.findAllGroups(seq);\r
-               for (int i = 0; i < groups.length; i++)\r
-               {\r
-                 int sy = s * av.charHeight + scaleHeight;\r
-                 for (int res = groups[i].getStartRes();\r
-                      res < groups[i].getEndRes() + 1; res++)\r
-                 {\r
-                   int alIndex = seq.findPosition(res);\r
-                   Object obj = ResidueProperties.aa2Triplet.get(\r
-                       seq.getCharAt(res) + "");\r
-                   if (obj == null)\r
-                     continue;\r
-\r
-                   String triplet = obj.toString();\r
-\r
-                   out.println(\r
-                       "<area shape=\"rect\" coords=\""\r
-                       + (idWidth + res * av.charWidth) + ","\r
-                       + sy + ","\r
-                       + (idWidth + (res + 1) * av.charWidth) + ","\r
-                       + (av.charHeight + sy) + "\""\r
-                       + " onMouseOver=\"toolTip('"\r
-                       + alIndex + " " + triplet +\r
-                       "<br><em>" + groups[i].getName() +\r
-                       "</em>')\"; onMouseOut=\"toolTip()\"; "\r
-                       + " href=\"#\">");\r
-                 }\r
-               }\r
-             }\r
-\r
-             out.println("</map></body></html>");\r
-             out.close();\r
-\r
-           }\r
-           catch (Exception ex)\r
-           {\r
-             ex.printStackTrace();\r
-           }\r
-         }///////////END OF IMAGE MAP\r
-\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     */\r
-    public void makePNG(File pngFile)\r
-    {\r
-      if(pngFile==null)\r
-      {\r
-        jalview.io.JalviewFileChooser chooser = new jalview.io.\r
-            JalviewFileChooser(jalview.bin.Cache.getProperty(\r
-                "LAST_DIRECTORY"), new String[]\r
-                               {"png"},\r
-                               new String[]\r
-                               {"Portable network graphics"},\r
-                               "Portable network graphics");\r
-        chooser.setFileView(new jalview.io.JalviewFileView());\r
-        chooser.setDialogTitle("Create EPS file from alignment");\r
-        chooser.setToolTipText("Save");\r
-\r
-        int value = chooser.showSaveDialog(this);\r
-\r
-        if (value != jalview.io.JalviewFileChooser.APPROVE_OPTION)\r
-        {\r
-          return;\r
-        }\r
-\r
-        pngFile = chooser.getSelectedFile();\r
-\r
-        jalview.bin.Cache.setProperty("LAST_DIRECTORY",\r
-                                      chooser.getSelectedFile().getParent());\r
-      }\r
-\r
-\r
-\r
-      int height = ( (av.alignment.getHeight() + 1) * av.charHeight) + 30;\r
-      int width = idPanel.getWidth() + (av.alignment.getWidth() * av.charWidth);\r
-\r
-      if (av.getWrapAlignment())\r
-      {\r
-        height = ( (av.alignment.getWidth() / av.getChunkWidth()) + 1) *\r
-            av.chunkHeight;\r
-        width = seqPanel.getWidth() + idPanel.getWidth();\r
-\r
-      }\r
-\r
-\r
-        if (av.getShowAnnotation())\r
-        {\r
-            height += annotationPanel.getPreferredSize().height;\r
-        }\r
-\r
-        try\r
-        {\r
-\r
-            FileOutputStream out = new FileOutputStream(pngFile);\r
-\r
-            BufferedImage bi = new BufferedImage(width, height,\r
-                    BufferedImage.TYPE_INT_RGB);\r
-            Graphics2D png = (Graphics2D) bi.getGraphics();\r
-\r
-            png.setRenderingHint(RenderingHints.KEY_ANTIALIASING,\r
-                RenderingHints.VALUE_ANTIALIAS_ON);\r
-\r
-            if (av.getWrapAlignment())\r
-            {\r
-                printWrappedAlignment(png, width, height, 0);\r
-            }\r
-            else\r
-            {\r
-                printUnwrapped(png, width, height, 0);\r
-            }\r
-\r
-            ImageIO.write(bi, "png", out);\r
-            out.close();\r
-        }\r
-        catch(OutOfMemoryError err)\r
-        {\r
-          System.out.println("########################\n"\r
-                             +"OUT OF MEMORY "+pngFile+"\n"\r
-                             +"########################");\r
-        }\r
-        catch (Exception ex)\r
-        {\r
-            ex.printStackTrace();\r
-        }\r
-    }\r
-}\r
-\r
-\r
-/**\r
- * DOCUMENT ME!\r
- *\r
- * @author $author$\r
- * @version $Revision$\r
- */\r
-class Preview extends JFrame\r
-{\r
-    /**\r
-     * Creates a new Preview object.\r
-     *\r
-     * @param image DOCUMENT ME!\r
-     */\r
-    public Preview(Image image)\r
-    {\r
-        setResizable(true);\r
-        setSize(image.getWidth(this), image.getHeight(this));\r
-        setVisible(true);\r
-        getContentPane().setLayout(new BorderLayout());\r
-        getContentPane().add(new PreviewPanel(image), BorderLayout.CENTER);\r
-        validate();\r
-        repaint();\r
-    }\r
-}\r
-\r
-\r
-/**\r
- * DOCUMENT ME!\r
- *\r
- * @author $author$\r
- * @version $Revision$\r
- */\r
-class PreviewPanel extends JPanel\r
-{\r
-    Image image;\r
-\r
-    /**\r
-     * Creates a new PreviewPanel object.\r
-     *\r
-     * @param image DOCUMENT ME!\r
-     */\r
-    public PreviewPanel(Image image)\r
-    {\r
-        this.image = image;\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param g DOCUMENT ME!\r
-     */\r
-    public void paintComponent(Graphics g)\r
-    {\r
-        if (image != null)\r
-        {\r
-            g.drawImage(image, 0, 0, this);\r
-        }\r
-        else\r
-        {\r
-            System.out.println("DEBUG:image is null");\r
-        }\r
-    }\r
-}\r
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ *
+ * This program 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 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program 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 PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+package jalview.gui;
+
+import jalview.datamodel.*;
+
+import jalview.jbgui.*;
+
+import jalview.schemes.*;
+
+import java.awt.*;
+import java.awt.event.*;
+import java.awt.print.*;
+
+import java.io.*;
+
+import javax.swing.*;
+
+
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class AlignmentPanel extends GAlignmentPanel
+    implements AdjustmentListener, Printable
+{
+  public AlignViewport av;
+  OverviewPanel overviewPanel;
+  SeqPanel seqPanel;
+  IdPanel idPanel;
+  IdwidthAdjuster idwidthAdjuster;
+
+  /** DOCUMENT ME!! */
+  public AlignFrame alignFrame;
+  ScalePanel scalePanel;
+  AnnotationPanel annotationPanel;
+  AnnotationLabels alabels;
+
+  // this value is set false when selection area being dragged
+  boolean fastPaint = true;
+  int hextent = 0;
+  int vextent = 0;
+
+  /**
+   * Creates a new AlignmentPanel object.
+   *
+   * @param af DOCUMENT ME!
+   * @param av DOCUMENT ME!
+   */
+  public AlignmentPanel(AlignFrame af, final AlignViewport av)
+  {
+    alignFrame = af;
+    this.av = av;
+    seqPanel = new SeqPanel(av, this);
+    idPanel = new IdPanel(av, this);
+
+    scalePanel = new ScalePanel(av, this);
+
+    idPanelHolder.add(idPanel, BorderLayout.CENTER);
+    idwidthAdjuster = new IdwidthAdjuster(this);
+    idSpaceFillerPanel1.add(idwidthAdjuster, BorderLayout.CENTER);
+
+    annotationPanel = new AnnotationPanel(this);
+    alabels = new AnnotationLabels(this);
+
+
+    annotationScroller.setViewportView(annotationPanel);
+    annotationSpaceFillerHolder.add(alabels, BorderLayout.CENTER);
+
+    fontChanged();
+
+    scalePanelHolder.add(scalePanel, BorderLayout.CENTER);
+    seqPanelHolder.add(seqPanel, BorderLayout.CENTER);
+
+    setScrollValues(0, 0);
+
+    adjustAnnotationHeight();
+
+    setAnnotationVisible(av.getShowAnnotation());
+
+    hscroll.addAdjustmentListener(this);
+    vscroll.addAdjustmentListener(this);
+
+    af.addKeyListener(new KeyAdapter()
+    {
+      public void keyPressed(KeyEvent evt)
+      {
+        if(av.cursorMode
+           && evt.getKeyCode()>=KeyEvent.VK_0
+           && evt.getKeyCode()<=KeyEvent.VK_9)
+        {
+          seqPanel.numberPressed(evt.getKeyChar());
+        }
+
+        switch (evt.getKeyCode())
+        {
+          case 27: // escape key
+            alignFrame.deselectAllSequenceMenuItem_actionPerformed(null);
+
+            break;
+
+          case KeyEvent.VK_DOWN:
+            if(av.cursorMode)
+            {
+              seqPanel.moveCursor(0,1);
+            }
+            else
+              alignFrame.moveSelectedSequences(false);
+            break;
+
+          case KeyEvent.VK_UP:
+            if (av.cursorMode)
+            {
+              seqPanel.moveCursor(0,-1);
+            }
+            else
+              alignFrame.moveSelectedSequences(true);
+            break;
+
+          case KeyEvent.VK_LEFT:
+            if(av.cursorMode)
+            {
+              seqPanel.moveCursor(-1,0);
+            }
+            break;
+
+          case KeyEvent.VK_RIGHT:
+            if (av.cursorMode)
+            {
+              seqPanel.moveCursor(1,0);
+            }
+            break;
+
+          case KeyEvent.VK_SPACE:
+            if(av.cursorMode)
+            {
+              seqPanel.insertGapAtCursor(evt.isControlDown() || evt.isShiftDown());
+            }
+            break;
+
+          case KeyEvent.VK_DELETE:
+          case KeyEvent.VK_BACK_SPACE:
+            if(!av.cursorMode)
+            {
+              alignFrame.cut_actionPerformed(null);
+            }
+            else
+              seqPanel.deleteGapAtCursor(evt.isControlDown() || evt.isShiftDown());
+
+            break;
+
+          case KeyEvent.VK_S:
+            if(av.cursorMode)
+            {
+              seqPanel.setCursorRow();
+            }
+            break;
+          case KeyEvent.VK_C:
+            if(av.cursorMode && !evt.isControlDown())
+            {
+              seqPanel.setCursorColumn();
+            }
+            break;
+          case KeyEvent.VK_P:
+            if(av.cursorMode)
+            {
+              seqPanel.setCursorPosition();
+            }
+            break;
+
+          case KeyEvent.VK_ENTER:
+          case KeyEvent.VK_COMMA:
+            if(av.cursorMode)
+            {
+              seqPanel.setCursorRowAndColumn();
+            }
+            break;
+
+          case KeyEvent.VK_Q:
+            if(av.cursorMode)
+            {
+              seqPanel.setSelectionAreaAtCursor(true);
+            }
+            break;
+          case KeyEvent.VK_M:
+            if(av.cursorMode)
+            {
+              seqPanel.setSelectionAreaAtCursor(false);
+            }
+            break;
+
+         case KeyEvent.VK_F2:
+           av.cursorMode = ! av.cursorMode;
+           alignFrame.statusBar.setText("Keyboard editing mode is "+
+               (av.cursorMode ? "on" : "off"));
+           if(av.cursorMode)
+           {
+             seqPanel.seqCanvas.cursorX = av.startRes;
+             seqPanel.seqCanvas.cursorY = av.startSeq;
+           }
+           seqPanel.seqCanvas.repaint();
+           break;
+
+          case KeyEvent.VK_F1:
+            try
+            {
+              ClassLoader cl = jalview.gui.Desktop.class.getClassLoader();
+              java.net.URL url = javax.help.HelpSet.findHelpSet(cl, "help/help");
+              javax.help.HelpSet hs = new javax.help.HelpSet(cl, url);
+
+              javax.help.HelpBroker hb = hs.createHelpBroker();
+              hb.setCurrentID("home");
+              hb.setDisplayed(true);
+            }
+            catch (Exception ex)
+            {
+              ex.printStackTrace();
+            }
+            break;
+          case KeyEvent.VK_H:
+          {
+            boolean toggleSeqs = !evt.isControlDown();
+            boolean toggleCols = !evt.isShiftDown();
+
+            boolean hide = false;
+
+            SequenceGroup sg = av.getSelectionGroup();
+            if(toggleSeqs)
+             {
+               if(sg != null && sg.getSize(false) != av.alignment.getHeight())
+               {
+                 alignFrame.hideSelSequences_actionPerformed(null);
+                 hide = true;
+               }
+               else if (!(toggleCols && av.colSel.getSelected().size() > 0))
+                 alignFrame.showAllSeqs_actionPerformed(null);
+             }
+
+             if (toggleCols)
+             {
+               if(av.colSel.getSelected().size() > 0)
+               {
+                 alignFrame.hideSelColumns_actionPerformed(null);
+                 if(!toggleSeqs)
+                   av.selectionGroup = sg;
+               }
+               else if(!hide)
+                 alignFrame.showAllColumns_actionPerformed(null);
+             }
+            break;
+          }
+
+        }
+      }
+    });
+  }
+
+  /**
+   * DOCUMENT ME!
+   */
+  public void fontChanged()
+  {
+    // set idCanvas bufferedImage to null
+    // to prevent drawing old image
+    FontMetrics fm = getFontMetrics(av.getFont());
+
+    scalePanelHolder.setPreferredSize(new Dimension(10,
+        av.charHeight + fm.getDescent()));
+    idSpaceFillerPanel1.setPreferredSize(new Dimension(10,
+        av.charHeight + fm.getDescent()));
+
+    idPanel.idCanvas.gg = null;
+    seqPanel.seqCanvas.img = null;
+    annotationPanel.adjustPanelHeight();
+
+    Dimension d = calculateIdWidth();
+    d.setSize(d.width + 4, d.height);
+    idPanel.idCanvas.setPreferredSize(d);
+    hscrollFillerPanel.setPreferredSize(d);
+
+    if (av.getWrapAlignment())
+    {
+      int max = av.alignment.getWidth() /
+          seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());
+      vscroll.setMaximum(max);
+      vscroll.setUnitIncrement(1);
+      vscroll.setVisibleAmount(1);
+    }
+    else
+    {
+      setScrollValues(av.getStartRes(), av.getStartSeq());
+    }
+
+    if (overviewPanel != null)
+      overviewPanel.setBoxPosition();
+
+    repaint();
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   */
+  public Dimension calculateIdWidth()
+  {
+    Container c = new Container();
+
+    FontMetrics fm = c.getFontMetrics(av.font);
+    AlignmentI al = av.getAlignment();
+
+    int i = 0;
+    int idWidth = 0;
+    String id;
+
+    while ( (i < al.getHeight()) && (al.getSequenceAt(i) != null))
+    {
+      SequenceI s = al.getSequenceAt(i);
+
+      id = s.getDisplayId(av.getShowJVSuffix());
+
+      if (fm.stringWidth(id) > idWidth)
+      {
+        idWidth = fm.stringWidth(id);
+      }
+
+      i++;
+    }
+
+    // Also check annotation label widths
+    i = 0;
+
+    if (al.getAlignmentAnnotation() != null)
+    {
+      fm = c.getFontMetrics(alabels.getFont());
+
+      while (i < al.getAlignmentAnnotation().length)
+      {
+        String label = al.getAlignmentAnnotation()[i].label;
+
+        if (fm.stringWidth(label) > idWidth)
+        {
+          idWidth = fm.stringWidth(label);
+        }
+
+        i++;
+      }
+    }
+
+    return new Dimension(idWidth, 12);
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param results DOCUMENT ME!
+   */
+  public void highlightSearchResults(SearchResults results)
+  {
+    seqPanel.seqCanvas.highlightSearchResults(results);
+
+    // do we need to scroll the panel?
+    if (results != null)
+    {
+      SequenceI seq = results.getResultSequence(0);
+      int seqIndex = av.alignment.findIndex(seq);
+      int start = seq.findIndex(results.getResultStart(0)) - 1;
+      int end = seq.findIndex(results.getResultEnd(0)) - 1;
+
+      if(!av.wrapAlignment)
+      {
+        if ( (av.getStartRes() > end)  || (av.getEndRes() < start) ||
+           ( (av.getStartSeq() > seqIndex) || (av.getEndSeq() < seqIndex)))
+        {
+          setScrollValues(start, seqIndex);
+        }
+      }
+      else
+      {
+        scrollToWrappedVisible(start);
+      }
+    }
+  }
+
+  void scrollToWrappedVisible(int res)
+  {
+    int cwidth = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());
+    if( res<=av.getStartRes() || res>=(av.getStartRes()+cwidth) )
+    {
+      vscroll.setValue(res / cwidth);
+      av.startRes = vscroll.getValue() * cwidth;
+    }
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   */
+  public OverviewPanel getOverviewPanel()
+  {
+    return overviewPanel;
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param op DOCUMENT ME!
+   */
+  public void setOverviewPanel(OverviewPanel op)
+  {
+    overviewPanel = op;
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param b DOCUMENT ME!
+   */
+  public void setAnnotationVisible(boolean b)
+  {
+    if (!av.wrapAlignment)
+    {
+      annotationSpaceFillerHolder.setVisible(b);
+      annotationScroller.setVisible(b);
+    }
+    repaint();
+  }
+
+  public void adjustAnnotationHeight()
+  {
+    javax.swing.SwingUtilities.invokeLater(new Runnable()
+    {
+      public void run()
+      {
+          while(alignFrame.getHeight()==0)
+          {
+            Thread.yield();
+          }
+
+        int height = annotationPanel.adjustPanelHeight();
+
+        if (height > alignFrame.getHeight() / 2)
+        {
+          height = alignFrame.getHeight() / 2;
+        }
+
+        annotationScroller.setPreferredSize(
+            new Dimension(annotationScroller.getWidth(),
+                          height));
+
+        annotationSpaceFillerHolder.setPreferredSize(new Dimension(
+            annotationSpaceFillerHolder.getWidth(),
+            height));
+
+        annotationPanel.repaint();
+        repaint();
+      }
+    });
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param wrap DOCUMENT ME!
+   */
+  public void setWrapAlignment(boolean wrap)
+  {
+    av.startSeq = 0;
+    scalePanelHolder.setVisible(!wrap);
+    hscroll.setVisible(!wrap);
+    idwidthAdjuster.setVisible(!wrap);
+
+    if (wrap)
+    {
+      annotationScroller.setVisible(false);
+      annotationSpaceFillerHolder.setVisible(false);
+    }
+    else if (av.showAnnotation)
+    {
+      annotationScroller.setVisible(true);
+      annotationSpaceFillerHolder.setVisible(true);
+    }
+
+    idSpaceFillerPanel1.setVisible(!wrap);
+
+    repaint();
+  }
+
+  // return value is true if the scroll is valid
+  public boolean scrollUp(boolean up)
+  {
+    if (up)
+    {
+      if (vscroll.getValue() < 1)
+      {
+        return false;
+      }
+
+      fastPaint = false;
+      vscroll.setValue(vscroll.getValue() - 1);
+    }
+    else
+    {
+      if ( (vextent + vscroll.getValue()) >= av.getAlignment().getHeight())
+      {
+        return false;
+      }
+
+      fastPaint = false;
+      vscroll.setValue(vscroll.getValue() + 1);
+    }
+
+    fastPaint = true;
+
+    return true;
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param right DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   */
+  public boolean scrollRight(boolean right)
+  {
+    if (!right)
+    {
+      if (hscroll.getValue() < 1)
+      {
+        return false;
+      }
+
+      fastPaint = false;
+      hscroll.setValue(hscroll.getValue() - 1);
+    }
+    else
+    {
+      if ( (hextent + hscroll.getValue()) >= av.getAlignment().getWidth())
+      {
+        return false;
+      }
+
+      fastPaint = false;
+      hscroll.setValue(hscroll.getValue() + 1);
+    }
+
+    fastPaint = true;
+
+    return true;
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param x DOCUMENT ME!
+   * @param y DOCUMENT ME!
+   */
+  public void setScrollValues(int x, int y)
+  {
+
+    int width = av.alignment.getWidth();
+    int height = av.alignment.getHeight();
+
+    if(av.hasHiddenColumns)
+     width = av.getColumnSelection().findColumnPosition(width);
+
+    av.setEndRes( (x + (seqPanel.seqCanvas.getWidth() / av.charWidth)) -1);
+
+    hextent = seqPanel.seqCanvas.getWidth() / av.charWidth;
+    vextent = seqPanel.seqCanvas.getHeight() / av.charHeight;
+
+    if (hextent > width)
+    {
+      hextent = width;
+    }
+
+    if (vextent > height)
+    {
+      vextent = height;
+    }
+
+    if ( (hextent + x) > width)
+    {
+      x = width - hextent;
+    }
+
+    if ( (vextent + y) > height)
+    {
+      y = height - vextent;
+    }
+
+    if (y < 0)
+    {
+      y = 0;
+    }
+
+    if (x < 0)
+    {
+      x = 0;
+    }
+
+    hscroll.setValues(x, hextent, 0, width);
+    vscroll.setValues(y, vextent, 0, height);
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param evt DOCUMENT ME!
+   */
+  public void adjustmentValueChanged(AdjustmentEvent evt)
+  {
+
+    int oldX = av.getStartRes();
+    int oldY = av.getStartSeq();
+
+    if (evt.getSource() == hscroll)
+    {
+      int x = hscroll.getValue();
+      av.setStartRes(x);
+      av.setEndRes( (x +
+                     (seqPanel.seqCanvas.getWidth() / av.getCharWidth())) - 1);
+    }
+
+    if (evt.getSource() == vscroll)
+    {
+      int offy = vscroll.getValue();
+
+      if (av.getWrapAlignment())
+      {
+        if(offy>-1)
+        {
+          int rowSize = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.
+              seqCanvas.getWidth());
+          av.setStartRes(offy * rowSize);
+          av.setEndRes( (offy + 1) * rowSize);
+        }
+        else
+        {
+          //This is only called if file loaded is a jar file that
+          //was wrapped when saved and user has wrap alignment true
+          //as preference setting
+          SwingUtilities.invokeLater(new Runnable()
+              {
+                public void run()
+                {
+                  setScrollValues(av.getStartRes(), av.getStartSeq());
+                }
+              });
+        }
+      }
+      else
+      {
+        av.setStartSeq(offy);
+        av.setEndSeq(offy +
+                     (seqPanel.seqCanvas.getHeight() / av.getCharHeight()));
+      }
+    }
+
+    if (overviewPanel != null)
+    {
+      overviewPanel.setBoxPosition();
+    }
+
+    int scrollX = av.startRes - oldX;
+    int scrollY = av.startSeq - oldY;
+
+    if (av.getWrapAlignment() || !fastPaint)
+    {
+      repaint();
+    }
+    else
+    {
+      // Make sure we're not trying to draw a panel
+      // larger than the visible window
+      if(scrollX>av.endRes-av.startRes)
+        scrollX = av.endRes-av.startRes;
+      else if(scrollX<av.startRes-av.endRes)
+        scrollX = av.startRes - av.endRes;
+
+      if(scrollX!=0 || scrollY!=0)
+      {
+        idPanel.idCanvas.fastPaint(scrollY);
+        seqPanel.seqCanvas.fastPaint(scrollX,
+                                     scrollY);
+        scalePanel.repaint();
+
+        if (av.getShowAnnotation())
+        {
+          annotationPanel.fastPaint(scrollX);
+        }
+      }
+    }
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param g DOCUMENT ME!
+   */
+  public void paintComponent(Graphics g)
+  {
+    invalidate();
+
+    Dimension d = idPanel.idCanvas.getPreferredSize();
+    idPanelHolder.setPreferredSize(d);
+    hscrollFillerPanel.setPreferredSize(new Dimension(d.width, 12));
+    validate();
+
+    if (av.getWrapAlignment())
+    {
+      int maxwidth = av.alignment.getWidth();
+
+      if (av.hasHiddenColumns)
+        maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1;
+
+      int max = maxwidth /
+          seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth()) +
+          1;
+
+
+      vscroll.setMaximum(max);
+      vscroll.setUnitIncrement(1);
+      vscroll.setVisibleAmount(1);
+    }
+    else
+    {
+      setScrollValues(av.getStartRes(), av.getStartSeq());
+    }
+
+    if( this.getVisibleRect().getBounds() == g.getClipBounds()
+        && overviewPanel != null)
+        overviewPanel.updateOverviewImage();
+
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param pg DOCUMENT ME!
+   * @param pf DOCUMENT ME!
+   * @param pi DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   *
+   * @throws PrinterException DOCUMENT ME!
+   */
+  public int print(Graphics pg, PageFormat pf, int pi)
+      throws PrinterException
+  {
+    pg.translate( (int) pf.getImageableX(), (int) pf.getImageableY());
+
+    int pwidth = (int) pf.getImageableWidth();
+    int pheight = (int) pf.getImageableHeight();
+
+    if (av.getWrapAlignment())
+    {
+      return printWrappedAlignment(pg, pwidth, pheight, pi);
+    }
+    else
+    {
+      return printUnwrapped(pg, pwidth, pheight, pi);
+    }
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param pg DOCUMENT ME!
+   * @param pwidth DOCUMENT ME!
+   * @param pheight DOCUMENT ME!
+   * @param pi DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   *
+   * @throws PrinterException DOCUMENT ME!
+   */
+  public int printUnwrapped(Graphics pg, int pwidth, int pheight, int pi)
+      throws PrinterException
+  {
+    int idWidth = calculateIdWidth().width + 4;
+    FontMetrics fm = getFontMetrics(av.getFont());
+    int scaleHeight = av.charHeight + fm.getDescent();
+
+    pg.setColor(Color.white);
+    pg.fillRect(0, 0, pwidth, pheight);
+    pg.setFont(av.getFont());
+
+    ////////////////////////////////////
+    /// How many sequences and residues can we fit on a printable page?
+    int totalRes = (pwidth - idWidth) / av.getCharWidth();
+
+    int totalSeq = (int) ( (pheight - scaleHeight) / av.getCharHeight()) -
+        1;
+
+    int pagesWide = (av.getAlignment().getWidth() / totalRes) + 1;
+
+    /////////////////////////////
+    /// Only print these sequences and residues on this page
+    int startRes;
+
+    /////////////////////////////
+    /// Only print these sequences and residues on this page
+    int endRes;
+
+    /////////////////////////////
+    /// Only print these sequences and residues on this page
+    int startSeq;
+
+    /////////////////////////////
+    /// Only print these sequences and residues on this page
+    int endSeq;
+    startRes = (pi % pagesWide) * totalRes;
+    endRes = (startRes + totalRes) - 1;
+
+    if (endRes > (av.getAlignment().getWidth() - 1))
+    {
+      endRes = av.getAlignment().getWidth() - 1;
+    }
+
+    startSeq = (pi / pagesWide) * totalSeq;
+    endSeq = startSeq + totalSeq;
+
+    if (endSeq > av.getAlignment().getHeight())
+    {
+      endSeq = av.getAlignment().getHeight();
+    }
+
+    int pagesHigh = ( (av.alignment.getHeight() / totalSeq) + 1) * pheight;
+
+    if (av.showAnnotation)
+    {
+      pagesHigh += annotationPanel.adjustPanelHeight() + 3;
+    }
+
+    pagesHigh /= pheight;
+
+    if (pi >= (pagesWide * pagesHigh))
+    {
+      return Printable.NO_SUCH_PAGE;
+    }
+
+    //draw Scale
+    pg.translate(idWidth, 0);
+    scalePanel.drawScale(pg, startRes, endRes, pwidth - idWidth, scaleHeight);
+    pg.translate( -idWidth, scaleHeight);
+
+    ////////////////
+    // Draw the ids
+    Color currentColor = null;
+    Color currentTextColor = null;
+
+    pg.setFont(new Font(av.getFont().getName(),
+                        Font.ITALIC,
+                        av.getFont().getSize()));
+    for (int i = startSeq; i < endSeq; i++)
+    {
+      if ( (av.getSelectionGroup() != null) &&
+          av.getSelectionGroup().getSequences(false).contains(
+              av.getAlignment().getSequenceAt(i)))
+      {
+        currentColor = Color.gray;
+        currentTextColor = Color.black;
+      }
+      else
+      {
+        currentColor = av.getAlignment().getSequenceAt(i).getColor();
+        currentTextColor = Color.black;
+      }
+
+      pg.setColor(currentColor);
+      pg.fillRect(0, (i - startSeq) * av.charHeight, idWidth,
+                  av.getCharHeight());
+
+      pg.setColor(currentTextColor);
+
+      String string = av.getAlignment().getSequenceAt(i).getDisplayId
+          ( av.getShowJVSuffix());
+
+      pg.drawString(string, 0,
+                    ( ( (i - startSeq) * av.charHeight) + av.getCharHeight()) -
+                    (av.getCharHeight() / 5));
+    }
+
+    pg.setFont(av.getFont());
+
+    // draw main sequence panel
+    pg.translate(idWidth, 0);
+    seqPanel.seqCanvas.drawPanel(pg, startRes, endRes, startSeq, endSeq, 0);
+
+    if (av.showAnnotation && (endSeq == av.alignment.getHeight()))
+    {
+      pg.translate( -idWidth-3, (endSeq - startSeq) * av.charHeight + 3);
+      alabels.drawComponent( (Graphics2D) pg, idWidth);
+      pg.translate(idWidth+3, 0);
+      annotationPanel.drawComponent( (Graphics2D) pg, startRes, endRes +
+                                    1);
+    }
+
+    return Printable.PAGE_EXISTS;
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param pg DOCUMENT ME!
+   * @param pwidth DOCUMENT ME!
+   * @param pheight DOCUMENT ME!
+   * @param pi DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   *
+   * @throws PrinterException DOCUMENT ME!
+   */
+  public int printWrappedAlignment(Graphics pg, int pwidth, int pheight,
+                                   int pi)
+      throws PrinterException
+  {
+
+    int annotationHeight = 0;
+    AnnotationLabels labels = null;
+    if (av.showAnnotation)
+    {
+      annotationHeight = annotationPanel.adjustPanelHeight();
+      labels = new AnnotationLabels(av);
+    }
+
+    int hgap = av.charHeight;
+    if (av.scaleAboveWrapped)
+      hgap += av.charHeight;
+
+    int cHeight = av.getAlignment().getHeight() * av.charHeight
+        + hgap
+        + annotationHeight;
+
+    int idWidth = calculateIdWidth().width + 4;
+
+    int maxwidth = av.alignment.getWidth();
+    if (av.hasHiddenColumns)
+      maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1;
+
+
+    int resWidth = seqPanel.seqCanvas.getWrappedCanvasWidth(pwidth -
+        idWidth);
+
+    int totalHeight = cHeight * (maxwidth / resWidth + 1);
+
+    pg.setColor(Color.white);
+    pg.fillRect(0, 0, pwidth, pheight);
+    pg.setFont(av.getFont());
+
+    ////////////////
+    // Draw the ids
+    pg.setColor(Color.black);
+
+    pg.translate(0, -pi * pheight);
+
+    pg.setClip(0, pi * pheight, pwidth, pheight);
+
+    int ypos = hgap;
+    Font italic = new Font(av.getFont().getName(), Font.ITALIC,
+                           av.getFont().getSize());
+    pg.setFont(italic);
+
+    do
+    {
+      for (int i = 0; i < av.alignment.getHeight(); i++)
+      {
+        SequenceI s = av.alignment.getSequenceAt(i);
+        String string = s.getDisplayId( av.getShowJVSuffix());
+
+        pg.drawString(string, 0,
+                      ( (i * av.charHeight) + ypos + av.charHeight) -
+                      (av.charHeight / 5));
+      }
+      if (labels != null)
+      {
+        pg.translate(-3,
+                     ypos +
+                     (av.getAlignment().getHeight() * av.charHeight));
+
+        pg.setFont(av.getFont());
+        labels.drawComponent(pg, idWidth);
+        pg.setFont(italic);
+        pg.translate(+3,
+                     -ypos -
+                     (av.getAlignment().getHeight() * av.charHeight));
+      }
+
+      ypos += cHeight;
+    }
+    while (ypos < totalHeight);
+
+    pg.translate(idWidth, 0);
+
+    seqPanel.seqCanvas.drawWrappedPanel(pg, pwidth - idWidth, totalHeight, 0);
+
+    if ( (pi * pheight) < totalHeight)
+    {
+      return Printable.PAGE_EXISTS;
+
+    }
+    else
+    {
+      return Printable.NO_SUCH_PAGE;
+    }
+  }
+
+  void makeAlignmentImage(int type, File file)
+  {
+    int maxwidth = av.alignment.getWidth();
+    if (av.hasHiddenColumns)
+      maxwidth = av.getColumnSelection().findColumnPosition(maxwidth);
+
+    int height = ( (av.alignment.getHeight() + 1) * av.charHeight) + 30;
+    int width = idPanel.getWidth() + (maxwidth * av.charWidth);
+    if (idPanel.getWidth() == 0)
+    {
+      width += calculateIdWidth().getWidth() + 4;
+    }
+
+    if (av.getWrapAlignment())
+    {
+      height = getWrappedHeight();
+      if (System.getProperty("java.awt.headless") != null
+          && System.getProperty("java.awt.headless").equals("true"))
+      {
+        width = alignFrame.getWidth() - 22;
+      }
+      else
+        width = seqPanel.getWidth() + idPanel.getWidth();
+
+    }
+    else if (av.getShowAnnotation())
+    {
+      height += annotationPanel.adjustPanelHeight() + 3;
+    }
+
+    jalview.util.ImageMaker im;
+    if(type==jalview.util.ImageMaker.PNG)
+      im  = new jalview.util.ImageMaker(this,
+                                        jalview.util.ImageMaker.PNG,
+                                        "Create PNG image from alignment",
+                                        width, height, file, null);
+    else
+      im = new jalview.util.ImageMaker(this,
+                                        jalview.util.ImageMaker.EPS,
+                                       "Create EPS file from alignment",
+                                        width, height, file, alignFrame.getTitle() );
+
+    try
+    {
+      if (av.getWrapAlignment())
+      {
+        if(im.getGraphics()!=null)
+        {
+          printWrappedAlignment(im.getGraphics(), width, height, 0);
+          im.writeImage();
+        }
+      }
+      else
+      {
+        if(im.getGraphics()!=null)
+        {
+          printUnwrapped(im.getGraphics(), width, height, 0);
+          im.writeImage();
+        }
+      }
+    }
+    catch (OutOfMemoryError err)
+    {
+      System.out.println("########################\n"
+                         + "OUT OF MEMORY " + file + "\n"
+                         + "########################");
+
+      JOptionPane.showInternalMessageDialog(Desktop.desktop,
+                                            "Out of Memory Creating Image!!"
+                                            +
+                                            "\nSee help files for increasing Java Virtual Machine memory."
+                                            , "Out of memory",
+                                            JOptionPane.WARNING_MESSAGE);
+      System.out.println("Create IMAGE: " + err);
+      System.gc();
+
+    }
+    catch (Exception ex)
+    {
+      ex.printStackTrace();
+    }
+  }
+  /**
+   * DOCUMENT ME!
+   */
+  public void makeEPS(File epsFile)
+  {
+    makeAlignmentImage(jalview.util.ImageMaker.EPS, epsFile);
+  }
+
+  /**
+   * DOCUMENT ME!
+   */
+  public void makePNG(File pngFile)
+  {
+    makeAlignmentImage(jalview.util.ImageMaker.PNG, pngFile);
+  }
+
+  public void makePNGImageMap(File imgMapFile, String imageName)
+  {
+    ///////ONLY WORKS WITH NONE WRAPPED ALIGNMENTS
+    //////////////////////////////////////////////
+    int idWidth = calculateIdWidth().width + 4;
+    FontMetrics fm = getFontMetrics(av.getFont());
+    int scaleHeight = av.charHeight + fm.getDescent();
+
+    // Gen image map
+    //////////////////////////////////
+    if (imgMapFile != null)
+    {
+      try
+      {
+        int s, sSize = av.alignment.getHeight(),
+            res, alwidth = av.alignment.getWidth(), g, gSize, f, fSize, sy;
+        StringBuffer text = new StringBuffer();
+        PrintWriter out = new PrintWriter(new FileWriter(imgMapFile));
+        out.println(jalview.io.HTMLOutput.getImageMapHTML());
+        out.println("<img src=\"" + imageName +
+                    "\" border=\"0\" usemap=\"#Map\" >"
+                    + "<map name=\"Map\">");
+
+        for (s = 0; s < sSize; s++)
+        {
+          sy = s * av.charHeight + scaleHeight;
+
+          SequenceI seq = av.alignment.getSequenceAt(s);
+          SequenceFeature [] features = seq.getDatasetSequence().getSequenceFeatures();
+          SequenceGroup[] groups = av.alignment.findAllGroups(seq);
+          for(res =0; res<alwidth; res++)
+          {
+            text = new StringBuffer();
+            Object obj = null;
+            if(av.alignment.isNucleotide())
+              obj = ResidueProperties.nucleotideName.get(seq.getCharAt(res)+"" );
+            else
+              obj = ResidueProperties.aa2Triplet.get(
+                    seq.getCharAt(res) + "");
+
+              if (obj == null)
+                  continue;
+
+            String triplet = obj.toString();
+            int alIndex = seq.findPosition(res);
+            gSize = groups.length;
+            for (g = 0; g < gSize; g++)
+            {
+              if(text.length()<1)
+              {
+                text.append("<area shape=\"rect\" coords=\""
+                  + (idWidth + res * av.charWidth) + ","
+                  + sy + ","
+                  + (idWidth + (res + 1) * av.charWidth) + ","
+                  + (av.charHeight + sy) + "\""
+                  + " onMouseOver=\"toolTip('"
+                  + alIndex + " " + triplet );
+              }
+
+              if(groups[g].getStartRes()<res && groups[g].getEndRes()>res)
+                text.append("<br><em>" + groups[g].getName() + "</em>");
+            }
+
+            if (features != null)
+            {
+              if(text.length()<1)
+              {
+                text.append("<area shape=\"rect\" coords=\""
+                  + (idWidth + res * av.charWidth) + ","
+                  + sy + ","
+                  + (idWidth + (res + 1) * av.charWidth) + ","
+                  + (av.charHeight + sy) + "\""
+                  + " onMouseOver=\"toolTip('"
+                  + alIndex + " " + triplet );
+              }
+                fSize = features.length;
+                for (f = 0; f < fSize; f++)
+                {
+
+                  if ( (features[f].getBegin() <= seq.findPosition(res)) &&
+                      (features[f].getEnd() >= seq.findPosition(res)))
+                  {
+                    if (features[f].getType().equals("disulfide bond"))
+                    {
+                      if (features[f].getBegin() == seq.findPosition(res)
+                          || features[f].getEnd() == seq.findPosition(res))
+                      {
+                        text.append("<br>disulfide bond " + features[f].getBegin() + ":" +
+                                       features[f].getEnd());
+                      }
+                    }
+                    else
+                    {
+                      text.append("<br>");
+                      text.append(features[f].getType());
+                      if (features[f].getDescription() != null && !features[f].getType().equals(features[f].getDescription()))
+                        text.append(" " + features[f].getDescription());
+
+                      if (features[f].getValue("status") != null )
+                      {
+                        text.append(" (" + features[f].getValue("status") + ")");
+                      }
+                    }
+                  }
+
+                }
+              }
+              if(text.length()>1)
+              {
+                text.append("')\"; onMouseOut=\"toolTip()\";  href=\"#\">");
+                out.println(text.toString());
+              }
+            }
+          }
+        out.println("</map></body></html>");
+        out.close();
+
+      }
+      catch (Exception ex)
+      {
+        ex.printStackTrace();
+      }
+    } ///////////END OF IMAGE MAP
+
+  }
+
+  int getWrappedHeight()
+  {
+    int seqPanelWidth = seqPanel.seqCanvas.getWidth();
+
+    //If headless, seqPanel will have 0 width
+    if (System.getProperty("java.awt.headless") != null
+              && System.getProperty("java.awt.headless").equals("true"))
+    {
+      int idWidth = calculateIdWidth().width + 4;
+      seqPanelWidth = alignFrame.getWidth() - idWidth;
+    }
+
+    int chunkWidth = seqPanel.seqCanvas.getWrappedCanvasWidth(
+        seqPanelWidth
+          );
+
+    int hgap = av.charHeight;
+    if (av.scaleAboveWrapped)
+      hgap += av.charHeight;
+
+    int annotationHeight = 0;
+    if (av.showAnnotation)
+    {
+      annotationHeight = annotationPanel.adjustPanelHeight();
+    }
+
+    int cHeight = av.getAlignment().getHeight() * av.charHeight
+        + hgap
+        + annotationHeight;
+
+    int maxwidth = av.alignment.getWidth();
+    if (av.hasHiddenColumns)
+      maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1;
+
+
+    int height = ( (maxwidth / chunkWidth) + 1) * cHeight;
+
+    return height;
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @author $author$
+   * @version $Revision$
+   */
+  class Preview
+      extends JFrame
+  {
+    /**
+     * Creates a new Preview object.
+     *
+     * @param image DOCUMENT ME!
+     */
+    public Preview(Image image)
+    {
+      setResizable(true);
+      setSize(image.getWidth(this), image.getHeight(this));
+      setVisible(true);
+      getContentPane().setLayout(new BorderLayout());
+      getContentPane().add(new PreviewPanel(image), BorderLayout.CENTER);
+      validate();
+      repaint();
+    }
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @author $author$
+   * @version $Revision$
+   */
+  class PreviewPanel
+      extends JPanel
+  {
+    Image image;
+
+    /**
+     * Creates a new PreviewPanel object.
+     *
+     * @param image DOCUMENT ME!
+     */
+    public PreviewPanel(Image image)
+    {
+      this.image = image;
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param g DOCUMENT ME!
+     */
+    public void paintComponent(Graphics g)
+    {
+      if (image != null)
+      {
+        g.drawImage(image, 0, 0, this);
+      }
+      else
+      {
+        System.out.println("DEBUG:image is null");
+      }
+    }
+  }
+}