From a02c010dd9c92b25f13974038329b541d424dc77 Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Wed, 17 Aug 2005 09:30:56 +0000 Subject: [PATCH] Use getDefault for exampleFile --- src/jalview/bin/Jalview.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java index ff2d06a..e8e66d8 100755 --- a/src/jalview/bin/Jalview.java +++ b/src/jalview/bin/Jalview.java @@ -133,7 +133,13 @@ public class Jalview try { UIManager.setLookAndFeel( - UIManager.getSystemLookAndFeelClassName() + UIManager.getSystemLookAndFeelClassName() + // UIManager.getCrossPlatformLookAndFeelClassName() +//"com.sun.java.swing.plaf.gtk.GTKLookAndFeel" +//"javax.swing.plaf.metal.MetalLookAndFeel" +//"com.sun.java.swing.plaf.windows.WindowsLookAndFeel" +//"com.sun.java.swing.plaf.motif.MotifLookAndFeel" + ); } catch (Exception ex) @@ -235,11 +241,13 @@ public class Jalview ////////////////////// if ( !headless && - jalview.bin.Cache.getProperty("SHOW_STARTUP_FILE").equals("true") && - jalview.bin.Cache.getProperty("STARTUP_FILE") != null) + jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true) && + jalview.bin.Cache.getDefault("STARTUP_FILE", + "http://www.jalview.org/examples/exampleFile.jar")!= null) { - file = jalview.bin.Cache.getProperty("STARTUP_FILE"); + file = jalview.bin.Cache.getDefault("STARTUP_FILE", + "http://www.jalview.org/examples/exampleFile.jar"); protocol = "File"; if (file.indexOf("http:") > -1) -- 1.7.10.2