From c90ec758e0d4c2dcbfd233eab0ef677df9deec53 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Fri, 6 Feb 2015 10:50:51 +0000 Subject: [PATCH] JAL-1551 formatting --- src/jalview/appletgui/UserDefinedColours.java | 4 ++++ src/jalview/gui/UserDefinedColours.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/jalview/appletgui/UserDefinedColours.java b/src/jalview/appletgui/UserDefinedColours.java index 6d8933c..32f5729 100644 --- a/src/jalview/appletgui/UserDefinedColours.java +++ b/src/jalview/appletgui/UserDefinedColours.java @@ -427,7 +427,9 @@ public class UserDefinedColours extends Panel implements ActionListener, { applyButton_actionPerformed(); if (dialog != null) + { dialog.setVisible(false); + } frame.setVisible(false); } @@ -557,7 +559,9 @@ public class UserDefinedColours extends Panel implements ActionListener, } } if (dialog != null) + { dialog.setVisible(false); + } frame.setVisible(false); return; diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java index 44a633b..3da159f 100755 --- a/src/jalview/gui/UserDefinedColours.java +++ b/src/jalview/gui/UserDefinedColours.java @@ -528,7 +528,7 @@ public class UserDefinedColours extends GUserDefinedColours implements } }else{ for (int i = 0; i < 24; i++){ - JButton button = (JButton) upperCaseButtons.get(i); + JButton button = upperCaseButtons.get(i); newColours[i] = button.getBackground(); } } @@ -547,7 +547,7 @@ public class UserDefinedColours extends GUserDefinedColours implements } }else{ for (int i = 0; i < 23; i++){ - JButton button = (JButton) lowerCaseButtons.get(i); + JButton button = lowerCaseButtons.get(i); newColours[i] = button.getBackground(); } } -- 1.7.10.2