X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFeatureRenderer.java;h=89e94c8ebfb2ae53588086470d7be50ab5c6a2c7;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=f7cc65edf84d1aa93ec5ff40ca9703b0ace5cd0d;hpb=25aaaa87042b3f507ad4348120df7dd073182759;p=jalview.git diff --git a/src/jalview/gui/FeatureRenderer.java b/src/jalview/gui/FeatureRenderer.java index f7cc65e..89e94c8 100644 --- a/src/jalview/gui/FeatureRenderer.java +++ b/src/jalview/gui/FeatureRenderer.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -55,7 +55,9 @@ import javax.swing.SwingConstants; * @author $author$ * @version $Revision$ */ -public class FeatureRenderer extends jalview.renderer.seqfeatures.FeatureRenderer implements jalview.api.FeatureRenderer +public class FeatureRenderer extends + jalview.renderer.seqfeatures.FeatureRenderer implements + jalview.api.FeatureRenderer { Color resBoxColour; @@ -72,7 +74,8 @@ public class FeatureRenderer extends jalview.renderer.seqfeatures.FeatureRendere super(); this.ap = ap; this.av = ap.av; - if (ap != null && ap.getSeqPanel() != null && ap.getSeqPanel().seqCanvas != null + if (ap != null && ap.getSeqPanel() != null + && ap.getSeqPanel().seqCanvas != null && ap.getSeqPanel().seqCanvas.fr != null) { transferSettings(ap.getSeqPanel().seqCanvas.fr); @@ -123,7 +126,8 @@ public class FeatureRenderer extends jalview.renderer.seqfeatures.FeatureRendere if (fcol instanceof Color) { Color col = JColorChooser.showDialog(Desktop.desktop, - MessageManager.getString("label.select_feature_colour"), ((Color) fcol)); + MessageManager.getString("label.select_feature_colour"), + ((Color) fcol)); if (col != null) { fcol = col; @@ -306,21 +310,22 @@ public class FeatureRenderer extends jalview.renderer.seqfeatures.FeatureRendere Object[] options; if (!newFeatures) { - options = new Object[] - { "Amend", "Delete", "Cancel" }; + options = new Object[] { "Amend", "Delete", "Cancel" }; } else { - options = new Object[] - { "OK", "Cancel" }; + options = new Object[] { "OK", "Cancel" }; } - String title = newFeatures ? MessageManager.getString("label.create_new_sequence_features") - : MessageManager.formatMessage("label.amend_delete_features", new String[]{sequences[0].getName()}); + String title = newFeatures ? MessageManager + .getString("label.create_new_sequence_features") + : MessageManager.formatMessage("label.amend_delete_features", + new String[] { sequences[0].getName() }); int reply = JOptionPane.showInternalOptionDialog(Desktop.desktop, bigPanel, title, JOptionPane.YES_NO_CANCEL_OPTION, - JOptionPane.QUESTION_MESSAGE, null, options, MessageManager.getString("action.ok")); + JOptionPane.QUESTION_MESSAGE, null, options, + MessageManager.getString("action.ok")); jalview.io.FeaturesFile ffile = new jalview.io.FeaturesFile(); @@ -406,7 +411,6 @@ public class FeatureRenderer extends jalview.renderer.seqfeatures.FeatureRendere return true; } - /** * update the amend feature button dependent on the given style *