JAL-3277 Fixed getdown splashscreen. For unknown reasons getdown thought it had both...

[jalview.git] / getdown / src / getdown / launcher / src / main / java / com / threerings / getdown / launcher / Getdown.java

diff --git a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java
index 7269c85..539b47e 100644 (file)
--- a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java
+++ b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java
@@ -807,10 +807,10 @@ public abstract class Getdown extends Thread
         if (_ifc.rotatingBackgrounds != null) {
             if (_ifc.backgroundImage != null) {
                 log.warning("ui.background_image and ui.rotating_background were both specified. " +
-                            "The rotating images are being used.");
+                            "The background image is being used.");
             }
-            return new RotatingBackgrounds(_ifc.rotatingBackgrounds, _ifc.errorBackground,
-                Getdown.this);
+            return new RotatingBackgrounds(loadImage(_ifc.backgroundImage));
+            //return new RotatingBackgrounds(_ifc.rotatingBackgrounds, _ifc.errorBackground, Getdown.this);
         } else if (_ifc.backgroundImage != null) {
             return new RotatingBackgrounds(loadImage(_ifc.backgroundImage));
         } else {
@@ -1038,61 +1038,6 @@ public abstract class Getdown extends Thread
         }
     };
 
-    public void setStartupFilesFromParameterString(String p) {
-      String q = "\"";
-      if (p != null && p.length() > 0) {
-        String[] filenames;
-        if (p.startsWith(q) && p.endsWith(q)) {
-          filenames = p.substring(1,p.length()-1).split("\" \"");
-        } else {
-          filenames = new String[]{p};
-        }
-        for (int i = 0; i < filenames.length; i++) {
-          String filename = filenames[i];
-          String ext = null;
-          int j = filename.lastIndexOf('.');
-          if (j > -1) {
-            ext = filename.substring(j+1);
-          }
-          // jvp files etc
-          boolean addedStartupFile = false; // only add one startup file
-          if (_app.startupFileExtensions.contains(ext.toLowerCase()) && ! addedStartupFile) {
-            File f = new File(filename);
-            if (f.exists()) {
-              _app.addStartupFile(f);
-              addedStartupFile = true;
-            }
-          }
-          // jvl files
-          if (_app.locatorFileExtension.equals(ext.toLowerCase())) {
-            // Do something special with this here
-            File f = new File(filename);
-            if (f.exists()) {
-              String appbase = null;
-              try {
-                java.util.Properties jvlprops = new java.util.Properties();
-                FileInputStream in = new FileInputStream(f);
-                jvlprops.load(in);
-                in.close();
-                appbase = jvlprops.getProperty("appbase");
-              } catch(Exception e) {
-                log.warning("Something went wrong reading Jalview Version Locator file '"+filename+"'", e);
-              }
-              if (appbase != null) {
-                try {
-                  URL newAppbase = new URL(appbase);
-                  _app.newAppbase(newAppbase);
-                  log.warning("Java Version Locator url '"+appbase+"' found in file '"+filename+"' being used");
-                } catch(MalformedURLException e) {
-                  log.warning("Java Version Locator url '"+appbase+"' found in file '"+filename+"' is malformed", e);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-
     protected Application _app;
     protected Application.UpdateInterface _ifc = new Application.UpdateInterface(Config.EMPTY);