diff --git a/uk/ac/sanger/artemis/components/FileViewer.java b/uk/ac/sanger/artemis/components/FileViewer.java index 520c8488650ad510c25769b4218b57c3ef02bd92..6e614ad1c359cec9931cbf688de81b29f50519f9 100644 --- a/uk/ac/sanger/artemis/components/FileViewer.java +++ b/uk/ac/sanger/artemis/components/FileViewer.java @@ -20,7 +20,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/FileViewer.java,v 1.12 2007-04-10 12:19:27 tjc Exp $ + * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/FileViewer.java,v 1.13 2007-04-10 13:39:38 tjc Exp $ */ package uk.ac.sanger.artemis.components; @@ -59,7 +59,7 @@ import uk.ac.sanger.artemis.Options; * be viewed. * * @author Kim Rutherford - * @version $Id: FileViewer.java,v 1.12 2007-04-10 12:19:27 tjc Exp $ + * @version $Id: FileViewer.java,v 1.13 2007-04-10 13:39:38 tjc Exp $ * **/ @@ -90,6 +90,8 @@ public class FileViewer extends JFrame **/ private static Point saved_position = null; + private boolean isHideOnClose = false; + /** * Create a new FileViewer component and make it visible. * @param label The name to attach to the new JFrame. @@ -152,9 +154,10 @@ public class FileViewer extends JFrame { public void actionPerformed(ActionEvent e) { - saved_size = getSize(); - saved_position = getLocation(); - dispose(); + if(isHideOnClose()) + setVisible(false); + else + dispose(); } }); button_panel.add(close_button); @@ -163,9 +166,10 @@ public class FileViewer extends JFrame { public void windowClosing(WindowEvent event) { - saved_size = getSize(); - saved_position = getLocation(); - dispose(); + if(isHideOnClose()) + setVisible(false); + else + dispose(); } }); @@ -377,4 +381,14 @@ public class FileViewer extends JFrame { return textPane; } + + public boolean isHideOnClose() + { + return isHideOnClose; + } + + public void setHideOnClose(boolean isHideOnClose) + { + this.isHideOnClose = isHideOnClose; + } } diff --git a/uk/ac/sanger/artemis/components/Splash.java b/uk/ac/sanger/artemis/components/Splash.java index 89fbbd5ef47e75b460d563f4a38e6ce5347481e3..47ebdf6b37e70dcffb75668dd6690deef393f3aa 100644 --- a/uk/ac/sanger/artemis/components/Splash.java +++ b/uk/ac/sanger/artemis/components/Splash.java @@ -20,7 +20,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/Splash.java,v 1.26 2007-03-22 14:18:09 tjc Exp $ + * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/Splash.java,v 1.27 2007-04-10 13:39:38 tjc Exp $ */ package uk.ac.sanger.artemis.components; @@ -48,7 +48,7 @@ import java.util.Properties; * Base class that creates a generic "Splash Screen" * * @author Kim Rutherford <kmr@sanger.ac.uk> - * @version $Id: Splash.java,v 1.26 2007-03-22 14:18:09 tjc Exp $ + * @version $Id: Splash.java,v 1.27 2007-04-10 13:39:38 tjc Exp $ **/ abstract public class Splash extends JFrame @@ -220,6 +220,8 @@ abstract public class Splash extends JFrame public static void initLogger() { + logger.log(""); + logger.getFileViewer().setHideOnClose(true); final InputStream options_input_stream = Splash.class.getResourceAsStream("/etc/log4j.properties");