git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'features/mchmmer' into merge/wsinterfaces_mchmmer_JAL-3070_JAL-1950
[jalview.git]
/
src
/
jalview
/
bin
/
Jalview.java
diff --git
a/src/jalview/bin/Jalview.java
b/src/jalview/bin/Jalview.java
index
287096d
..
a992ace
100755
(executable)
--- a/
src/jalview/bin/Jalview.java
+++ b/
src/jalview/bin/Jalview.java
@@
-61,6
+61,7
@@
import java.util.HashMap;
import java.util.Map;
import java.util.Vector;
import java.util.Map;
import java.util.Vector;
+import javax.swing.LookAndFeel;
import javax.swing.UIManager;
import groovy.lang.Binding;
import javax.swing.UIManager;
import groovy.lang.Binding;
@@
-148,7
+149,6
@@
public class Jalview
af.setProgressBar(MessageManager
.getString("status.das_features_being_retrived"), id);
af.featureSettings_actionPerformed(null);
af.setProgressBar(MessageManager
.getString("status.das_features_being_retrived"), id);
af.featureSettings_actionPerformed(null);
- af.featureSettings.fetchDasFeatures(dasSources, true);
af.setProgressBar(null, id);
synchronized (us)
{
af.setProgressBar(null, id);
synchronized (us)
{
@@
-175,6
+175,8
@@
public class Jalview
*
* @param args
* open <em>filename</em>
*
* @param args
* open <em>filename</em>
+ * @throws InterruptedException
+ * @throws IOException
*/
public static void main(String[] args)
{
*/
public static void main(String[] args)
{
@@
-184,6
+186,8
@@
public class Jalview
/**
* @param args
/**
* @param args
+ * @throws InterruptedException
+ * @throws IOException
*/
void doMain(String[] args)
{
*/
void doMain(String[] args)
{
@@
-280,25
+284,32
@@
public class Jalview
}
if (Platform.isAMac())
{
}
if (Platform.isAMac())
{
+
+ LookAndFeel lookAndFeel = ch.randelshofer.quaqua.QuaquaManager
+ .getLookAndFeel();
System.setProperty("com.apple.mrj.application.apple.menu.about.name",
"Jalview");
System.setProperty("apple.laf.useScreenMenuBar", "true");
System.setProperty("com.apple.mrj.application.apple.menu.about.name",
"Jalview");
System.setProperty("apple.laf.useScreenMenuBar", "true");
- try
- {
- UIManager.setLookAndFeel(
- ch.randelshofer.quaqua.QuaquaManager.getLookAndFeel());
- } catch (Throwable e)
+ if (lookAndFeel != null)
{
{
- System.err.println(
- "Failed to set QuaQua look and feel: " + e.toString());
+ try
+ {
+ UIManager.setLookAndFeel(lookAndFeel);
+ } catch (Throwable e)
+ {
+ System.err.println(
+ "Failed to set QuaQua look and feel: " + e.toString());
+ }
}
}
- if (!ch.randelshofer.quaqua.QuaquaManager.getLookAndFeel()
- .equals(UIManager.getLookAndFeel()))
+ if (lookAndFeel == null || !(lookAndFeel.getClass()
+ .isAssignableFrom(UIManager.getLookAndFeel().getClass()))
+ || !UIManager.getLookAndFeel().getClass().toString()
+ .toLowerCase().contains("quaqua"))
{
try
{
System.err.println(
{
try
{
System.err.println(
- "Quaqua LaF not available. Using VAqua(4).");
+ "Quaqua LaF not available on this plaform. Using VAqua(4).\nSee https://issues.jalview.org/browse/JAL-2976");
UIManager.setLookAndFeel("org.violetlib.aqua.AquaLookAndFeel");
} catch (Throwable e)
{
UIManager.setLookAndFeel("org.violetlib.aqua.AquaLookAndFeel");
} catch (Throwable e)
{