X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWebserviceInfo.java;h=4d0c63485bb1177a3bd1917945125c411058ebc5;hb=153dd62dc91da13ae732600e6ea55ddbe15eab39;hp=ccda9d1747de9fdf896878ee3d2f393f87c85dd4;hpb=89a0b775abfaa90242a171ca8133784a424a3d7b;p=jalview.git diff --git a/src/jalview/gui/WebserviceInfo.java b/src/jalview/gui/WebserviceInfo.java index ccda9d1..4d0c634 100755 --- a/src/jalview/gui/WebserviceInfo.java +++ b/src/jalview/gui/WebserviceInfo.java @@ -1,20 +1,19 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2005 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 + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6) + * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * + * This file is part of Jalview. + * + * Jalview 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 3 of the License, or (at your option) any later version. + * + * Jalview 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 Jalview. If not, see . */ package jalview.gui; @@ -26,362 +25,496 @@ import java.awt.image.*; import javax.swing.*; import jalview.jbgui.*; - +import jalview.ws.WSClientI; /** * Base class for web service client thread and gui - * + * * @author $author$ * @version $Revision$ */ public class WebserviceInfo extends GWebserviceInfo { - /** Job is Queued */ - public static final int STATE_QUEUING = 0; - - /** Job is Running */ - public static final int STATE_RUNNING = 1; - - /** Job has finished with no errors */ - public static final int STATE_STOPPED_OK = 2; - - /** Job has been cancelled with no errors */ - public static final int STATE_CANCELLED_OK = 3; - - /** job has stopped because of some error */ - public static final int STATE_STOPPED_ERROR = 4; - - /** job has failed because of some unavoidable service interruption */ - public static final int STATE_STOPPED_SERVERERROR = 5; - int currentStatus = STATE_QUEUING; - Image image; - int angle = 0; - String title = ""; - jalview.ws.WSClientI thisService; - boolean serviceIsCancellable; - JInternalFrame frame; - JTabbedPane subjobs=null; - java.util.Vector jobPanes = null; - private boolean serviceCanMergeResults = false; - private boolean viewResultsImmediatly = true; - // tabbed or not - public synchronized int addJobPane() { - JScrollPane jobpane = new JScrollPane(); - JTextArea progressText = new JTextArea(); - progressText.setFont(new java.awt.Font("Verdana", 0, 10)); - progressText.setBorder(null); - progressText.setEditable(false); - progressText.setText("WS Job"); - progressText.setLineWrap(true); - progressText.setWrapStyleWord(true); - jobpane.setName("JobPane"); - jobpane.getViewport().add(progressText, null); - jobpane.setBorder(null); - if (jobPanes==null) { - jobPanes = new Vector(); - } - int newpane = jobPanes.size(); - jobPanes.add(jobpane); + /** Job is Queued */ + public static final int STATE_QUEUING = 0; - if (newpane==0) { - this.add(jobpane, BorderLayout.CENTER); - } else { - if (newpane==1) { - // revert to a tabbed pane. - JScrollPane firstpane; - this.remove(firstpane=(JScrollPane) jobPanes.get(0)); - subjobs=new JTabbedPane(); - this.add(subjobs, BorderLayout.CENTER); - subjobs.add(firstpane); - subjobs.setTitleAt(0, firstpane.getName()); - } - subjobs.add(jobpane); - } - return newpane; // index for accessor methods below - } - /** - * Creates a new WebserviceInfo object. - * - * @param title short name and job type - * @param info reference or other human readable description - */ - public WebserviceInfo(String title, String info) - { - init(title, info, 520, 500); - } + /** Job is Running */ + public static final int STATE_RUNNING = 1; + + /** Job has finished with no errors */ + public static final int STATE_STOPPED_OK = 2; + + /** Job has been cancelled with no errors */ + public static final int STATE_CANCELLED_OK = 3; + + /** job has stopped because of some error */ + public static final int STATE_STOPPED_ERROR = 4; + + /** job has failed because of some unavoidable service interruption */ + public static final int STATE_STOPPED_SERVERERROR = 5; - /** - * Creates a new WebserviceInfo object. - * - * @param title DOCUMENT ME! - * @param info DOCUMENT ME! - * @param width DOCUMENT ME! - * @param height DOCUMENT ME! - */ - public WebserviceInfo(String title, String info, int width, int height) + int currentStatus = STATE_QUEUING; + + Image image; + + int angle = 0; + + String title = ""; + + jalview.ws.WSClientI thisService; + + boolean serviceIsCancellable; + + JInternalFrame frame; + + JTabbedPane subjobs = null; + + java.util.Vector jobPanes = null; + + private boolean serviceCanMergeResults = false; + + private boolean viewResultsImmediatly = true; + + // tabbed or not + public synchronized int addJobPane() + { + JScrollPane jobpane = new JScrollPane(); + JTextArea progressText = new JTextArea(); + progressText.setFont(new java.awt.Font("Verdana", 0, 10)); + progressText.setBorder(null); + progressText.setEditable(false); + progressText.setText("WS Job"); + progressText.setLineWrap(true); + progressText.setWrapStyleWord(true); + jobpane.setName("JobPane"); + jobpane.getViewport().add(progressText, null); + jobpane.setBorder(null); + if (jobPanes == null) { - init(title, info, width, height); + jobPanes = new Vector(); } + int newpane = jobPanes.size(); + jobPanes.add(jobpane); - /** - * DOCUMENT ME! - * - * @return DOCUMENT ME! - */ - public jalview.ws.WSClientI getthisService() + if (newpane == 0) { - return thisService; + this.add(jobpane, BorderLayout.CENTER); } - - /** - * DOCUMENT ME! - * - * @param newservice DOCUMENT ME! - */ - public void setthisService(jalview.ws.WSClientI newservice) + else { - thisService = newservice; - serviceIsCancellable = newservice.isCancellable(); - frame.setClosable(!serviceIsCancellable); - serviceCanMergeResults = newservice.canMergeResults(); + if (newpane == 1) + { + // revert to a tabbed pane. + JScrollPane firstpane; + this.remove(firstpane = (JScrollPane) jobPanes.get(0)); + subjobs = new JTabbedPane(); + this.add(subjobs, BorderLayout.CENTER); + subjobs.add(firstpane); + subjobs.setTitleAt(0, firstpane.getName()); + } + subjobs.add(jobpane); } + return newpane; // index for accessor methods below + } + + /** + * Creates a new WebserviceInfo object. + * + * @param title + * short name and job type + * @param info + * reference or other human readable description + */ + public WebserviceInfo(String title, String info) + { + init(title, info, 520, 500); + } - /** - * DOCUMENT ME! - * - * @param title DOCUMENT ME! - * @param info DOCUMENT ME! - * @param width DOCUMENT ME! - * @param height DOCUMENT ME! - */ - void init(String title, String info, int width, int height) + /** + * Creates a new WebserviceInfo object. + * + * @param title + * DOCUMENT ME! + * @param info + * DOCUMENT ME! + * @param width + * DOCUMENT ME! + * @param height + * DOCUMENT ME! + */ + public WebserviceInfo(String title, String info, int width, int height) + { + init(title, info, width, height); + } + + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public jalview.ws.WSClientI getthisService() + { + return thisService; + } + + /** + * Update state of GUI based on client capabilities (like whether the job is + * cancellable, whether the 'merge results' button is shown. + * + * @param newservice + * service client to query for capabilities + */ + public void setthisService(jalview.ws.WSClientI newservice) + { + thisService = newservice; + serviceIsCancellable = newservice.isCancellable(); + frame.setClosable(!serviceIsCancellable); + serviceCanMergeResults = newservice.canMergeResults(); + rebuildButtonPanel(); + } + + private void rebuildButtonPanel() + { + if (buttonPanel != null) { - frame = new JInternalFrame(); - frame.setContentPane(this); - Desktop.addInternalFrame(frame, title, width, height); + buttonPanel.removeAll(); + if (serviceIsCancellable) + { + buttonPanel.add(cancel); frame.setClosable(false); + } + else + { + frame.setClosable(true); + } + } + } + + /** + * DOCUMENT ME! + * + * @param title + * DOCUMENT ME! + * @param info + * DOCUMENT ME! + * @param width + * DOCUMENT ME! + * @param height + * DOCUMENT ME! + */ + void init(String title, String info, int width, int height) + { + frame = new JInternalFrame(); + frame.setContentPane(this); + Desktop.addInternalFrame(frame, title, width, height); + frame.setClosable(false); - this.title = title; - setInfoText(info); + this.title = title; + setInfoText(info); - java.net.URL url = getClass().getResource("/images/logo.gif"); - image = java.awt.Toolkit.getDefaultToolkit().createImage(url); + java.net.URL url = getClass().getResource("/images/logo.gif"); + image = java.awt.Toolkit.getDefaultToolkit().createImage(url); - MediaTracker mt = new MediaTracker(this); - mt.addImage(image, 0); + MediaTracker mt = new MediaTracker(this); + mt.addImage(image, 0); - try - { - mt.waitForID(0); - } - catch (Exception ex) + try + { + mt.waitForID(0); + } catch (Exception ex) + { + } + + AnimatedPanel ap = new AnimatedPanel(); + titlePanel.add(ap, BorderLayout.CENTER); + + Thread thread = new Thread(ap); + thread.start(); + final WebserviceInfo thisinfo = this; + frame.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter() + { + public void internalFrameClosed( + javax.swing.event.InternalFrameEvent evt) + { + // System.out.println("Shutting down webservice client"); + WSClientI service = thisinfo.getthisService(); + if (service != null && service.isCancellable()) { + service.cancelJob(); } + }; + }); + frame.validate(); - AnimatedPanel ap = new AnimatedPanel(); - titlePanel.add(ap, BorderLayout.CENTER); + } - Thread thread = new Thread(ap); - thread.start(); - } + /** + * DOCUMENT ME! + * + * @param status + * integer status from state constants + */ + public void setStatus(int status) + { + currentStatus = status; + } - /** - * DOCUMENT ME! - * - * @param status integer status from state constants - */ - public void setStatus(int status) + /** + * subjob status indicator + * + * @param jobpane + * @param status + */ + public void setStatus(int jobpane, int status) + { + if (jobpane < 0 || jobpane >= jobPanes.size()) { - currentStatus = status; + throw new Error("setStatus called for non-existent job pane." + + jobpane); } - /** - * subjob status indicator - * @param jobpane - * @param status - */ - public void setStatus(int jobpane, int status) { - if (jobpane<0 || jobpane>=jobPanes.size()) { - throw new Error("setStatus called for non-existent job pane."+jobpane); - } - switch (status) { - case STATE_QUEUING: - setProgressName(jobpane+" - QUEUED", jobpane); - break; - case STATE_RUNNING: - setProgressName(jobpane+" - RUNNING", jobpane); - break; - case STATE_STOPPED_OK: - setProgressName(jobpane+" - FINISHED", jobpane); + switch (status) + { + case STATE_QUEUING: + setProgressName(jobpane + " - QUEUED", jobpane); break; - case STATE_CANCELLED_OK: - setProgressName(jobpane+" - CANCELLED", jobpane); - break; - case STATE_STOPPED_ERROR: - setProgressName(jobpane+" - BROKEN",jobpane); - break; - case STATE_STOPPED_SERVERERROR: - setProgressName(jobpane+" - ALERT", jobpane); - break; - default: - setProgressName(jobpane+" - UNKNOWN STATE", jobpane); - } + case STATE_RUNNING: + setProgressName(jobpane + " - RUNNING", jobpane); + break; + case STATE_STOPPED_OK: + setProgressName(jobpane + " - FINISHED", jobpane); + break; + case STATE_CANCELLED_OK: + setProgressName(jobpane + " - CANCELLED", jobpane); + break; + case STATE_STOPPED_ERROR: + setProgressName(jobpane + " - BROKEN", jobpane); + break; + case STATE_STOPPED_SERVERERROR: + setProgressName(jobpane + " - ALERT", jobpane); + break; + default: + setProgressName(jobpane + " - UNKNOWN STATE", jobpane); } - /** - * DOCUMENT ME! - * - * @return DOCUMENT ME! - */ - public String getInfoText() + } + + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public String getInfoText() + { + return infoText.getText(); + } + + /** + * DOCUMENT ME! + * + * @param text + * DOCUMENT ME! + */ + public void setInfoText(String text) + { + infoText.setText(text); + } + + /** + * DOCUMENT ME! + * + * @param text + * DOCUMENT ME! + */ + public void appendInfoText(String text) + { + infoText.append(text); + } + + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public String getProgressText(int which) + { + if (jobPanes == null) { - return infoText.getText(); + addJobPane(); } + return ((JTextArea) ((JScrollPane) jobPanes.get(which)).getViewport() + .getComponent(0)).getText(); + } - /** - * DOCUMENT ME! - * - * @param text DOCUMENT ME! - */ - public void setInfoText(String text) + /** + * DOCUMENT ME! + * + * @param text + * DOCUMENT ME! + */ + public void setProgressText(int which, String text) + { + if (jobPanes == null) { - infoText.setText(text); + addJobPane(); } + ((JTextArea) ((JScrollPane) jobPanes.get(which)).getViewport() + .getComponent(0)).setText(text); + } - /** - * DOCUMENT ME! - * - * @param text DOCUMENT ME! - */ - public void appendInfoText(String text) + /** + * DOCUMENT ME! + * + * @param text + * DOCUMENT ME! + */ + public void appendProgressText(int which, String text) + { + if (jobPanes == null) { - infoText.append(text); + addJobPane(); } - /** - * DOCUMENT ME! - * - * @return DOCUMENT ME! - */ - public String getProgressText(int which) + ((JTextArea) ((JScrollPane) jobPanes.get(which)).getViewport() + .getComponent(0)).append(text); + } + + /** + * setProgressText(0, text) + */ + public void setProgressText(String text) + { + setProgressText(0, text); + } + + /** + * appendProgressText(0, text) + */ + public void appendProgressText(String text) + { + appendProgressText(0, text); + } + + /** + * getProgressText(0) + */ + public String getProgressText() + { + return getProgressText(0); + } + + /** + * get the tab title for a subjob + * + * @param which + * int + * @return String + */ + public String getProgressName(int which) + { + if (jobPanes == null) { - if (jobPanes == null) - addJobPane(); - return ( (JTextArea) ( (JScrollPane) jobPanes.get(which)).getViewport(). - getComponent(0)).getText(); + addJobPane(); } - /** - * DOCUMENT ME! - * - * @param text DOCUMENT ME! - */ - public void setProgressText(int which, String text) + if (subjobs != null) { - if (jobPanes == null) - addJobPane(); - ( (JTextArea) ( (JScrollPane) jobPanes.get(which)).getViewport(). - getComponent(0)).setText(text); + return subjobs.getTitleAt(which); } - - /** - * DOCUMENT ME! - * - * @param text DOCUMENT ME! - */ - public void appendProgressText(int which, String text) + else { - if (jobPanes == null) - addJobPane(); - ( (JTextArea) ( (JScrollPane) jobPanes.get(which)).getViewport(). - getComponent(0)).append(text); + return ((JScrollPane) jobPanes.get(which)).getViewport() + .getComponent(0).getName(); } - /** - * setProgressText(0, text) - */ - public void setProgressText(String text) + } + + /** + * set the tab title for a subjob + * + * @param name + * String + * @param which + * int + */ + public void setProgressName(String name, int which) + { + if (subjobs != null) { - setProgressText(0, text); + subjobs.setTitleAt(which, name); + subjobs.revalidate(); + subjobs.repaint(); } - /** - * appendProgressText(0, text) - */ - public void appendProgressText(String text) + JScrollPane c = (JScrollPane) jobPanes.get(which); + c.getViewport().getComponent(0).setName(name); + c.repaint(); + } + + /** + * Gui action for cancelling the current job, if possible. + * + * @param e + * DOCUMENT ME! + */ + protected void cancel_actionPerformed(ActionEvent e) + { + if (!serviceIsCancellable) { - appendProgressText(0, text); + // JBPNote : TODO: We should REALLY just tell the WSClientI to cancel + // anyhow - it has to stop threads and clean up + // JBPNote : TODO: Instead of a warning, we should have an optional 'Are + // you sure?' prompt + warnUser("This job cannot be cancelled.\nJust close the window.", + "Cancel job"); } - /** - * getProgressText(0) - */ - public String getProgressText() + else { - return getProgressText(0); + thisService.cancelJob(); } - /** - * get the tab title for a subjob - * @param which int - * @return String - */ - public String getProgressName(int which) { - if (jobPanes==null) - addJobPane(); - if (subjobs!=null) - return subjobs.getTitleAt(which); - else - return ((JScrollPane) jobPanes.get(which)).getViewport().getComponent(0).getName(); - } - /** - * set the tab title for a subjob - * @param name String - * @param which int - */ - public void setProgressName(String name, int which) { - if (subjobs!=null) { - subjobs.setTitleAt(which, name); - subjobs.revalidate(); - subjobs.repaint(); + frame.setClosable(true); + } + + /** + * Spawns a thread that pops up a warning dialog box with the given message + * and title. + * + * @param message + * @param title + */ + public void warnUser(final String message, final String title) + { + javax.swing.SwingUtilities.invokeLater(new Runnable() + { + public void run() + { + JOptionPane.showInternalMessageDialog(Desktop.desktop, message, + title, JOptionPane.WARNING_MESSAGE); + } - JScrollPane c=(JScrollPane) jobPanes.get(which); - c.getViewport().getComponent(0).setName(name); - c.repaint(); - } + }); + } - /** - * Gui action for cancelling the current job, if possible. - * - * @param e DOCUMENT ME! - */ - protected void cancel_actionPerformed(ActionEvent e) + /** + * Set up GUI for user to get at results - and possibly automatically display + * them if viewResultsImmediatly is set. + */ + public void setResultsReady() + { + frame.setClosable(true); + buttonPanel.remove(cancel); + buttonPanel.add(showResultsNewFrame); + if (serviceCanMergeResults) { - if (!serviceIsCancellable) - { - JOptionPane.showInternalMessageDialog(Desktop.desktop, - "This job cannot be cancelled.\nJust close the window.", "Cancel job", - JOptionPane.WARNING_MESSAGE); - } - else - { - thisService.cancelJob(); - } - frame.setClosable(true); + buttonPanel.add(mergeResults); + buttonPanel.setLayout(new GridLayout(2, 1, 5, 5)); } - /** - * Set up GUI for user to get at results - and possibly automatically display - * them if viewResultsImmediatly is set. - */ - public void setResultsReady() + buttonPanel.validate(); + validate(); + if (viewResultsImmediatly) { - frame.setClosable(true); - buttonPanel.remove(cancel); - buttonPanel.add(showResultsNewFrame); - if (serviceCanMergeResults) - buttonPanel.add(mergeResults); - buttonPanel.setLayout(new GridLayout(2,1,5,5)); - buttonPanel.validate(); - validate(); - if (viewResultsImmediatly) - showResultsNewFrame.doClick(); + showResultsNewFrame.doClick(); } + } /** - * called when job has finished but no result objects can be passed back to user + * called when job has finished but no result objects can be passed back to + * user */ public void setFinishedNoResults() { @@ -392,101 +525,103 @@ public class WebserviceInfo extends GWebserviceInfo } class AnimatedPanel extends JPanel implements Runnable + { + long startTime = 0; + + BufferedImage offscreen; + + public void run() { - long startTime = 0; - BufferedImage offscreen; + startTime = System.currentTimeMillis(); - public void run() + while (currentStatus < STATE_STOPPED_OK) + { + try { - startTime = System.currentTimeMillis(); - Graphics2D g = null; - - while (currentStatus < STATE_STOPPED_OK) - { - try - { - Thread.sleep(50); + Thread.sleep(50); - int units = (int) ( (System.currentTimeMillis() - startTime) / - 10f); - angle += units; - angle %= 360; - startTime = System.currentTimeMillis(); + int units = (int) ((System.currentTimeMillis() - startTime) / 10f); + angle += units; + angle %= 360; + startTime = System.currentTimeMillis(); - if (offscreen == null || offscreen.getWidth(this) != getWidth() - || offscreen.getHeight(this) != getHeight()) - { - offscreen = new BufferedImage(getWidth(), getHeight(), - BufferedImage.TYPE_INT_ARGB); - g = (Graphics2D) offscreen.getGraphics(); - } + if (currentStatus >= STATE_STOPPED_OK) + { + angle = 0; + } - g.setColor(Color.white); - g.fillRect(0, 0, getWidth(), getHeight()); + repaint(); + } catch (Exception ex) + { + } + } - g.setFont(new Font("Arial", Font.BOLD, 12)); - g.setColor(Color.black); + cancel.setEnabled(false); + } - switch (currentStatus) - { - case STATE_QUEUING: - g.drawString(title.concat(" - queuing"), 60, 30); + void drawPanel() + { + if (offscreen == null || offscreen.getWidth(this) != getWidth() + || offscreen.getHeight(this) != getHeight()) + { + offscreen = new BufferedImage(getWidth(), getHeight(), + BufferedImage.TYPE_INT_ARGB); + } - break; + Graphics2D g = (Graphics2D) offscreen.getGraphics(); - case STATE_RUNNING: - g.drawString(title.concat(" - running"), 60, 30); + g.setColor(Color.white); + g.fillRect(0, 0, getWidth(), getHeight()); - break; + g.setFont(new Font("Arial", Font.BOLD, 12)); + g.setColor(Color.black); - case STATE_STOPPED_OK: - g.drawString(title.concat(" - complete"), 60, 30); + switch (currentStatus) + { + case STATE_QUEUING: + g.drawString(title.concat(" - queuing"), 60, 30); - break; + break; - case STATE_CANCELLED_OK: - g.drawString(title.concat(" - job cancelled!"), 60, 30); + case STATE_RUNNING: + g.drawString(title.concat(" - running"), 60, 30); - break; + break; - case STATE_STOPPED_ERROR: - g.drawString(title.concat(" - job error!"), 60, 30); + case STATE_STOPPED_OK: + g.drawString(title.concat(" - complete"), 60, 30); - break; + break; - case STATE_STOPPED_SERVERERROR: - g.drawString(title.concat(" - Server Error! (try later)"), - 60, - 30); + case STATE_CANCELLED_OK: + g.drawString(title.concat(" - job cancelled!"), 60, 30); - break; - } + break; + case STATE_STOPPED_ERROR: + g.drawString(title.concat(" - job error!"), 60, 30); - if (currentStatus >= STATE_STOPPED_OK) - angle = 0; + break; - if (image != null) - { - g.rotate(Math.toRadians(angle), 28, 28); - g.drawImage(image, 10, 10, this); - g.rotate( -Math.toRadians(angle), 28, 28); - } + case STATE_STOPPED_SERVERERROR: + g.drawString(title.concat(" - Server Error! (try later)"), 60, 30); + break; + } - repaint(); - } - catch (Exception ex) - { - } - } + if (image != null) + { + g.rotate(Math.toRadians(angle), 28, 28); + g.drawImage(image, 10, 10, this); + g.rotate(-Math.toRadians(angle), 28, 28); + } + } - cancel.setEnabled(false); - } + public void paintComponent(Graphics g1) + { + drawPanel(); - public void paintComponent(Graphics g1) - { - g1.drawImage(offscreen, 0,0,this); - } + g1.drawImage(offscreen, 0, 0, this); } + } }