X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAppJmol.java;h=c5273dd0b86fdcb90666a984e43cf86028e76e3b;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=fdc47fc5f8962b42e8e017d5709ecc1b9887bc43;hpb=6fbc6ba37a390e3cbac8f7577146ef45772c12ec;p=jalview.git diff --git a/src/jalview/gui/AppJmol.java b/src/jalview/gui/AppJmol.java index fdc47fc..c5273dd 100644 --- a/src/jalview/gui/AppJmol.java +++ b/src/jalview/gui/AppJmol.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) - * Copyright (C) $$Year-Rel$$ The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -174,7 +174,8 @@ public class AppJmol extends StructureViewerBase _alignwith = new Vector(); } - seqColourBy = new ViewSelectionMenu(MessageManager.getString("label.colour_by"), this, _colourwith, + seqColourBy = new ViewSelectionMenu( + MessageManager.getString("label.colour_by"), this, _colourwith, new ItemListener() { @@ -194,7 +195,8 @@ public class AppJmol extends StructureViewerBase }); viewMenu.add(seqColourBy); final ItemListener handler; - JMenu alpanels = new ViewSelectionMenu(MessageManager.getString("label.superpose_with"), this, + JMenu alpanels = new ViewSelectionMenu( + MessageManager.getString("label.superpose_with"), this, _alignwith, handler = new ItemListener() { @@ -205,8 +207,8 @@ public class AppJmol extends StructureViewerBase alignStructs.setToolTipText(MessageManager .formatMessage( "label.align_structures_using_linked_alignment_views", - new String[] - { new Integer(_alignwith.size()).toString() })); + new String[] { new Integer(_alignwith + .size()).toString() })); } }); handler.itemStateChanged(null); @@ -381,6 +383,7 @@ public class AppJmol extends StructureViewerBase command = ""; } jmb.evalStateCommand(command); + jmb.evalStateCommand("set hoverDelay=0.1"); jmb.setFinishedInit(true); } @@ -488,7 +491,8 @@ public class AppJmol extends StructureViewerBase long hdl = pdbid.hashCode() - System.currentTimeMillis(); if (progressBar != null) { - progressBar.setProgressBar(MessageManager.formatMessage("status.fetching_pdb", new String[]{pdbid}), hdl); + progressBar.setProgressBar(MessageManager.formatMessage( + "status.fetching_pdb", new String[] { pdbid }), hdl); } try { @@ -503,7 +507,8 @@ public class AppJmol extends StructureViewerBase } if (progressBar != null) { - progressBar.setProgressBar(MessageManager.getString("label.state_completed"), hdl); + progressBar.setProgressBar( + MessageManager.getString("label.state_completed"), hdl); } if (pdbseq != null) { @@ -554,9 +559,8 @@ public class AppJmol extends StructureViewerBase JOptionPane.showInternalMessageDialog(Desktop.desktop, MessageManager .formatMessage("label.pdb_entries_couldnt_be_retrieved", - new String[] - { errormsgs.toString() }), MessageManager - .getString("label.couldnt_load_file"), + new String[] { errormsgs.toString() }), + MessageManager.getString("label.couldnt_load_file"), JOptionPane.ERROR_MESSAGE); } @@ -674,8 +678,7 @@ public class AppJmol extends StructureViewerBase try { // TODO: cope with multiple PDB files in view - in = new BufferedReader(new FileReader( - jmb.getPdbFile()[0])); + in = new BufferedReader(new FileReader(jmb.getPdbFile()[0])); File outFile = chooser.getSelectedFile(); PrintWriter out = new PrintWriter(new FileOutputStream(outFile)); @@ -749,15 +752,14 @@ public class AppJmol extends StructureViewerBase if (type == jalview.util.ImageMaker.TYPE.PNG) { im = new jalview.util.ImageMaker(this, - jalview.util.ImageMaker.TYPE.PNG, - "Make PNG image from view", width, height, null, null); + jalview.util.ImageMaker.TYPE.PNG, "Make PNG image from view", + width, height, null, null); } else if (type == jalview.util.ImageMaker.TYPE.EPS) { im = new jalview.util.ImageMaker(this, - jalview.util.ImageMaker.TYPE.EPS, - "Make EPS file from view", width, height, null, - this.getTitle()); + jalview.util.ImageMaker.TYPE.EPS, "Make EPS file from view", + width, height, null, this.getTitle()); } else { @@ -889,8 +891,9 @@ public class AppJmol extends StructureViewerBase @Override public void backGround_actionPerformed(ActionEvent actionEvent) { - java.awt.Color col = JColorChooser.showDialog(this, - MessageManager.getString("label.select_backgroud_colour"), null); + java.awt.Color col = JColorChooser + .showDialog(this, MessageManager + .getString("label.select_backgroud_colour"), null); if (col != null) { jmb.setBackgroundColour(col);