JAL-3741 http to https (and jar to jvp for exampleFile defaults!)

[jalview.git] / src / jalview / gui / Desktop.java

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 67ef952..e214816 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -850,8 +850,13 @@ public class Desktop extends jalview.jbgui.GDesktop
     } catch (java.beans.PropertyVetoException ve) {
     } catch (java.lang.ClassCastException cex) {
       Cache.log.warn(
+<<<<<<< HEAD
           "Squashed a possible GUI implementation error. If you can recreate this, please look at https://issues.jalview.org/browse/JAL-869",
           cex);
+=======
+              "Squashed a possible GUI implementation error. If you can recreate this, please look at https://issues.jalview.org/browse/JAL-869",
+              cex);
+>>>>>>> 48040645e (JAL-3741 http to https (and jar to jvp for exampleFile defaults!))
     }
   }
 
@@ -1016,6 +1021,15 @@ public class Desktop extends jalview.jbgui.GDesktop
 
     JPanel panel = new JPanel(new GridLayout(2, 1));
     panel.add(label);
+<<<<<<< HEAD
+=======
+    panel.add(history);
+    history.setPreferredSize(new Dimension(400, 20));
+    history.setEditable(true);
+    history.addItem("https://www.");
+
+    String historyItems = jalview.bin.Cache.getProperty("RECENT_URL");
+>>>>>>> 48040645e (JAL-3741 http to https (and jar to jvp for exampleFile defaults!))
 
     /*
      * the URL to fetch is input in Java: an editable combobox with history JS:
@@ -1188,6 +1202,7 @@ public class Desktop extends jalview.jbgui.GDesktop
         message.append("<div style=\"color: #FF0000;font-style: bold;\">");
       }
 
+<<<<<<< HEAD
       message.append("<br>!! Version ").append(Cache.getDefault("LATEST_VERSION", "..Checking.."))
           .append(" is available for download from ")
           .append(Cache.getDefault("www.jalview.org", "https://www.jalview.org")).append(" !!");
@@ -1202,6 +1217,31 @@ public class Desktop extends jalview.jbgui.GDesktop
     message.append("</div>");
 
     return message.toString();
+=======
+      message.append("<br>!! Version "
+              + jalview.bin.Cache.getDefault("LATEST_VERSION",
+                      "..Checking..")
+              + " is available for download from "
+              + jalview.bin.Cache.getDefault("www.jalview.org",
+                      "https://www.jalview.org")
+              + " !!");
+      if (red)
+      {
+        message.append("</div>");
+      }
+    }
+    message.append("<br>Authors:  " + jalview.bin.Cache.getDefault(
+            "AUTHORFNAMES",
+            "The Jalview Authors (See AUTHORS file for current list)")
+            + "<br><br>Development managed by The Barton Group, University of Dundee, Scotland, UK.<br>"
+            + "<br><br>For help, see the FAQ at <a href=\"https://www.jalview.org/faq\">www.jalview.org/faq</a> and/or join the jalview-discuss@jalview.org mailing list"
+            + "<br><br>If  you use Jalview, please cite:"
+            + "<br>Waterhouse, A.M., Procter, J.B., Martin, D.M.A, Clamp, M. and Barton, G. J. (2009)"
+            + "<br>Jalview Version 2 - a multiple sequence alignment editor and analysis workbench"
+            + "<br>Bioinformatics doi: 10.1093/bioinformatics/btp033"
+            + "</html>");
+    return message;
+>>>>>>> 48040645e (JAL-3741 http to https (and jar to jvp for exampleFile defaults!))
   }
 
   /**