X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAssociatePdbFileWithSeq.java;h=cb00e39c3135c5c0ccf5cde336486b2acf9c166c;hb=f6a7e5514230be7ea8c2d4cccb504b4ed95f80ef;hp=6f36a791be246c619e9df8ad2dbcdaecc6818822;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git diff --git a/src/jalview/gui/AssociatePdbFileWithSeq.java b/src/jalview/gui/AssociatePdbFileWithSeq.java index 6f36a79..cb00e39 100644 --- a/src/jalview/gui/AssociatePdbFileWithSeq.java +++ b/src/jalview/gui/AssociatePdbFileWithSeq.java @@ -1,20 +1,20 @@ -/******************************************************************************* - * 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 * PURPOSE. See the GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License along with Jalview. If not, see . - *******************************************************************************/ + */ package jalview.gui; import javax.swing.JOptionPane; @@ -25,35 +25,40 @@ import jalview.datamodel.SequenceI; /** * GUI related routines for associating PDB files with sequences + * * @author JimP - * + * */ public class AssociatePdbFileWithSeq { -/** - * assocate the given PDB file with - * @param choice - * @param sequence - */ - public PDBEntry associatePdbWithSeq(String choice, String protocol, SequenceI sequence, boolean prompt) + /** + * assocate the given PDB file with + * + * @param choice + * @param sequence + */ + public PDBEntry associatePdbWithSeq(String choice, String protocol, + SequenceI sequence, boolean prompt) { PDBEntry entry = new PDBEntry(); try { - MCview.PDBfile pdbfile = new MCview.PDBfile(choice, - protocol); + MCview.PDBfile pdbfile = new MCview.PDBfile(choice, protocol); if (pdbfile.id == null) { String reply = null; - - if (prompt) { reply = JOptionPane - .showInternalInputDialog( - Desktop.desktop, - "Couldn't find a PDB id in the file supplied." - + "Please enter an Id to identify this structure.", - "No PDB Id in File", JOptionPane.QUESTION_MESSAGE);} + + if (prompt) + { + reply = JOptionPane + .showInternalInputDialog( + Desktop.desktop, + "Couldn't find a PDB id in the file supplied." + + "Please enter an Id to identify this structure.", + "No PDB Id in File", JOptionPane.QUESTION_MESSAGE); + } if (reply == null) { return null;