X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FUserDefinedColours.java;h=342c065261eeb7ca1280c7d8739a0ad8fd5200ee;hb=9612728299dc4c2242a6a968875a194624983920;hp=a59a77222362a9147c304d9dacbc357adcb043a2;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git diff --git a/src/jalview/appletgui/UserDefinedColours.java b/src/jalview/appletgui/UserDefinedColours.java index a59a772..342c065 100644 --- a/src/jalview/appletgui/UserDefinedColours.java +++ b/src/jalview/appletgui/UserDefinedColours.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 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. * @@ -187,7 +187,7 @@ public class UserDefinedColours extends Panel implements ActionListener, setTargetColour(colour); okcancelPanel.setBounds(new Rectangle(0, 113, 400, 35)); - frame.setTitle("User Defined Colours - " + label); + frame.setTitle(MessageManager.getString("label.user_defined_colours") + " - " + label); frame.setSize(420, 200); } @@ -206,7 +206,7 @@ public class UserDefinedColours extends Panel implements ActionListener, // // not 1.1 compatible! // dialog = new Dialog(((JVDialog)alignframe), title, true); // } else { - throw new Error("Unsupported owner for User Colour scheme dialog."); + throw new Error(MessageManager.getString("label.error_unsupported_owwner_user_colour_scheme")); } dialog.add(this); @@ -278,7 +278,8 @@ public class UserDefinedColours extends Panel implements ActionListener, } frame = new Frame(); frame.add(this); - jalview.bin.JalviewLite.addFrame(frame, MessageManager.getString("label.user_defined_colours"), 420, + jalview.bin.JalviewLite.addFrame(frame, + MessageManager.getString("label.user_defined_colours"), 420, 345); if (seqGroup != null) @@ -426,7 +427,9 @@ public class UserDefinedColours extends Panel implements ActionListener, { applyButton_actionPerformed(); if (dialog != null) + { dialog.setVisible(false); + } frame.setVisible(false); } @@ -488,7 +491,7 @@ public class UserDefinedColours extends Panel implements ActionListener, UserColourScheme ucs = new UserColourScheme(newColours); if (ap != null) { - ucs.setThreshold(0, ap.av.getIgnoreGapsConsensus()); + ucs.setThreshold(0, ap.av.isIgnoreGapsConsensus()); } if (ap != null) @@ -556,7 +559,9 @@ public class UserDefinedColours extends Panel implements ActionListener, } } if (dialog != null) + { dialog.setVisible(false); + } frame.setVisible(false); return;