Merge branch 'Release_2_8_2_Branch' of https://source.jalview.org/git/jalview.git...
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 21 Nov 2014 14:30:33 +0000 (14:30 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 21 Nov 2014 14:30:33 +0000 (14:30 +0000)
1  2 
src/jalview/gui/Desktop.java

@@@ -323,8 -323,11 +323,11 @@@ public class Desktop extends jalview.jb
      }
      jconsole = new Console(this, showjconsole);
      // add essential build information
-     jconsole.setHeader("Jalview Desktop "
+     jconsole.setHeader("Jalview Version: "
              + jalview.bin.Cache.getProperty("VERSION") + "\n"
+             + "Jalview Installation: "
+             + jalview.bin.Cache.getDefault("INSTALLATION", "unknown")
+             + "\n"
              + "Build Date: "
              + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown") + "\n"
              + "Java version: " + System.getProperty("java.version") + "\n"
                                                  + ermsg
                                                  + "</td></tr></table>"
                                                  + "<p>It may be that you have invalid JABA URLs<br/>in your web service preferences,"
 -                                                + " or mis-configured HTTP proxy settings.</p>"
 +                                                + "<br>or as a command-line argument, or mis-configured HTTP proxy settings.</p>"
                                                  + "<p>Check the <em>Connections</em> and <em>Web services</em> tab<br/>of the"
                                                  + " Tools->Preferences dialog box to change them.</p></html>"),
                                  "Web Service Configuration Problem",