X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FWSWUBlastClient.java;h=55e72ebbb2afe3be7def0613f8b4ecbde97f2288;hb=fee1b781ca14aadea5d112fc554fe14879c787c5;hp=d94d0214f98054584a6bbc6061fbda8cfcc1c179;hpb=838e4f91d4a53dd315640dbc9ff6ef7a815ee576;p=jalview.git diff --git a/src/jalview/io/WSWUBlastClient.java b/src/jalview/io/WSWUBlastClient.java index d94d021..55e72eb 100755 --- a/src/jalview/io/WSWUBlastClient.java +++ b/src/jalview/io/WSWUBlastClient.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1) - * Copyright (C) 2015 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -27,6 +27,7 @@ import jalview.datamodel.Sequence; import jalview.gui.AlignmentPanel; import jalview.gui.CutAndPasteTransfer; import jalview.gui.Desktop; +import jalview.gui.JvOptionPane; import jalview.util.MessageManager; import java.util.ArrayList; @@ -35,7 +36,6 @@ import java.util.StringTokenizer; import java.util.Vector; import javax.swing.ImageIcon; -import javax.swing.JOptionPane; import uk.ac.ebi.www.Data; import uk.ac.ebi.www.InputParams; @@ -150,11 +150,11 @@ public class WSWUBlastClient { // This must be outside the run() body as java 1.5 // will not return any value from the OptionPane to the expired thread. - int reply = JOptionPane.showConfirmDialog(Desktop.desktop, + int reply = JvOptionPane.showConfirmDialog(Desktop.desktop, "Automatically update suggested ids?", - "Auto replace sequence ids", JOptionPane.YES_NO_OPTION); + "Auto replace sequence ids", JvOptionPane.YES_NO_OPTION); - if (reply == JOptionPane.YES_OPTION) + if (reply == JvOptionPane.YES_OPTION) { Enumeration keys = suggestedIds.elements(); while (keys.hasMoreElements()) @@ -176,7 +176,7 @@ public class WSWUBlastClient } } - DBRefEntry[] entries = oldseq.getDBRef(); + DBRefEntry[] entries = oldseq.getDBRefs(); if (entries != null) { oldseq.addDBRef(new jalview.datamodel.DBRefEntry( @@ -211,6 +211,7 @@ public class WSWUBlastClient } } + @Override public void run() { while (jobsRunning > 0) @@ -250,6 +251,7 @@ public class WSWUBlastClient this.sequence = sequence; } + @Override public void run() { StartJob();