X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FUserDefinedColours.java;h=6831a734fd0c3e1789821550312fc0be6c56b8a2;hb=106a3890f956e2aa7780b2985f4326655912a558;hp=845110e7d4464ed641fd163199f93ea1820fcd22;hpb=342037486db348e0d40faf044b8111ddb06c222e;p=jalview.git diff --git a/src/jalview/appletgui/UserDefinedColours.java b/src/jalview/appletgui/UserDefinedColours.java index 845110e..6831a73 100644 --- a/src/jalview/appletgui/UserDefinedColours.java +++ b/src/jalview/appletgui/UserDefinedColours.java @@ -54,8 +54,8 @@ import java.awt.event.FocusListener; import java.awt.event.MouseEvent; import java.util.Vector; -public class UserDefinedColours extends Panel implements ActionListener, - AdjustmentListener, FocusListener +public class UserDefinedColours extends Panel + implements ActionListener, AdjustmentListener, FocusListener { AlignmentPanel ap; @@ -64,7 +64,7 @@ public class UserDefinedColours extends Panel implements ActionListener, Button selectedButton; - Vector oldColours = new Vector(); + Vector oldColours = new Vector<>(); ColourSchemeI oldColourScheme; @@ -214,9 +214,8 @@ public class UserDefinedColours extends Panel implements ActionListener, // // not 1.1 compatible! // dialog = new Dialog(((JVDialog)alignframe), title, true); // } else { - throw new Error( - MessageManager - .getString("label.error_unsupported_owwner_user_colour_scheme")); + throw new Error(MessageManager.getString( + "label.error_unsupported_owwner_user_colour_scheme")); } dialog.add(this); @@ -225,11 +224,12 @@ public class UserDefinedColours extends Panel implements ActionListener, int height = 160 + alignframe.getInsets().top + getInsets().bottom; int width = 400; - dialog.setBounds(alignframe.getBounds().x - + (alignframe.getSize().width - width) / 2, + dialog.setBounds( + alignframe.getBounds().x + + (alignframe.getSize().width - width) / 2, alignframe.getBounds().y - + (alignframe.getSize().height - height) / 2, width, - height); + + (alignframe.getSize().height - height) / 2, + width, height); } @@ -520,7 +520,7 @@ public class UserDefinedColours extends Panel implements ActionListener, ap.av.isIgnoreGapsConsensus()); } ap.seqPanel.seqCanvas.img = null; - ap.paintAlignment(true); + ap.paintAlignment(true, true); } else if (jmol != null) { @@ -599,7 +599,7 @@ public class UserDefinedColours extends Panel implements ActionListener, { ap.av.setGlobalColourScheme(oldColourScheme); } - ap.paintAlignment(true); + ap.paintAlignment(true, true); } frame.setVisible(false);