From 34cacab1aa78fb038290f393f3344c10fe40bd7f Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Wed, 12 May 2010 18:27:23 +0000
Subject: [PATCH] update macosx file drop
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@13816 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
.../artemis/components/alignment/BamFrame.java | 4 +---
.../artemis/components/alignment/BamView.java | 13 +++++++++++--
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/uk/ac/sanger/artemis/components/alignment/BamFrame.java b/uk/ac/sanger/artemis/components/alignment/BamFrame.java
index dbd94dbd0..8b350a446 100644
--- a/uk/ac/sanger/artemis/components/alignment/BamFrame.java
+++ b/uk/ac/sanger/artemis/components/alignment/BamFrame.java
@@ -53,8 +53,6 @@ import javax.swing.JOptionPane;
protected void loadFile(final String bamFile)
{
this.bamFile = bamFile;
- JOptionPane.showMessageDialog(this, bamFile);
-
}
protected void exitApp()
@@ -71,7 +69,7 @@ import javax.swing.JOptionPane;
return bamFile;
}
- private boolean isMac()
+ protected static boolean isMac()
{
return System.getProperty("mrj.version") != null;
}
diff --git a/uk/ac/sanger/artemis/components/alignment/BamView.java b/uk/ac/sanger/artemis/components/alignment/BamView.java
index 0a7b21aac..187ae8329 100644
--- a/uk/ac/sanger/artemis/components/alignment/BamView.java
+++ b/uk/ac/sanger/artemis/components/alignment/BamView.java
@@ -2867,8 +2867,17 @@ public class BamView extends JPanel
public static void main(String[] args)
{
BamFrame frame = new BamFrame();
- if(args.length == 0 && frame.getBamFile() != null)
- args = new String[]{ frame.getBamFile() };
+
+ if(args.length == 0 && BamFrame.isMac())
+ {
+ try
+ {
+ Thread.sleep(1000);
+ }
+ catch (InterruptedException e1) {}
+ if(frame.getBamFile() != null);
+ args = new String[]{ frame.getBamFile() };
+ }
List<String> bam = new Vector<String>();
String reference = null;
--
GitLab