X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fbin%2FJalview.java;h=df9501df17baff43e54350562dbb32bf1163ed53;hb=8eb35a7bab22595255245c5136dd780816b98f26;hp=362b15eb1fb880171a91d11df281be28c544bd5f;hpb=c9f21b2f940ed83ee018f7651302e7d3cea489c5;p=jalview.git diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java index 362b15e..df9501d 100755 --- a/src/jalview/bin/Jalview.java +++ b/src/jalview/bin/Jalview.java @@ -1,13 +1,13 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8) + * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle * * This file is part of Jalview. * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - * + * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -17,6 +17,10 @@ */ package jalview.bin; +import java.awt.FlowLayout; +import java.awt.Frame; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.io.BufferedReader; import java.io.File; import java.io.FileOutputStream; @@ -24,7 +28,6 @@ import java.io.IOException; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.lang.reflect.Constructor; -import java.net.MalformedURLException; import java.net.URI; import java.net.URL; import java.net.URLDecoder; @@ -67,6 +70,11 @@ public class Jalview } }); } + /** + * Put protein=true for get a protein example + */ + private static boolean protein=false; + /** * main class for Jalview application @@ -157,7 +165,7 @@ public class Jalview { headless = true; } - + System.setProperty("http.agent", "Jalview Desktop/"+Cache.getDefault("VERSION", "Unknown")); try { Cache.initLogger(); @@ -216,6 +224,7 @@ public class Jalview } } } + desktop.checkForNews(); } String file = null, protocol = null, format = null, data = null; @@ -515,8 +524,15 @@ public class Jalview // We'll only open the default file if the desktop is visible. // And the user // //////////////////// + + + + + + + if (!headless && file == null && vamsasImport == null - && jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true)) + && jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true) && protein == true) { file = jalview.bin.Cache.getDefault( "STARTUP_FILE", @@ -589,7 +605,8 @@ public class Jalview desktop.setInBatchMode(false); } } - + + private static void startUsageStats(final Desktop desktop) { /** @@ -901,6 +918,21 @@ public class Jalview * @author Andrew Waterhouse and JBP documented. * */ + +class rnabuttonlistener implements ActionListener{ + public void actionPerformed(ActionEvent arg0) { + System.out.println("Good idea ! "); + + } +} + +class pbuttonlistener implements ActionListener{ + public void actionPerformed(ActionEvent arg0) { + + + } +} + class ArgsParser { Vector vargs = null; @@ -1039,4 +1071,7 @@ class FeatureFetcher { return queued == 0 && running == 0; } + + + };