From 6206b07ee4ce7f91cac4bbd49cb9f9b0e512cf39 Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Sat, 20 May 2023 17:08:06 +0100 Subject: [PATCH] JAL-3416 Ensure setFrameIcon(null) is set for remaining JInternalFrames --- src/jalview/jbgui/GAlignFrame.java | 1 + src/jalview/jbgui/GCutAndPasteHtmlTransfer.java | 7 ++++--- src/jalview/jbgui/GCutAndPasteTransfer.java | 8 ++++---- src/jalview/jbgui/GPCAPanel.java | 7 ++++--- src/jalview/jbgui/GRnaStructureViewer.java | 1 + src/jalview/jbgui/GSplitFrame.java | 5 +++-- src/jalview/jbgui/GStructureViewer.java | 2 +- src/jalview/jbgui/GTreePanel.java | 7 ++++--- 8 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java index 5b886b6..f6ab8c9 100755 --- a/src/jalview/jbgui/GAlignFrame.java +++ b/src/jalview/jbgui/GAlignFrame.java @@ -263,6 +263,7 @@ public class GAlignFrame extends JInternalFrame private void jbInit() throws Exception { + setFrameIcon(null); initColourMenu(); JMenuItem saveAs = new JMenuItem( diff --git a/src/jalview/jbgui/GCutAndPasteHtmlTransfer.java b/src/jalview/jbgui/GCutAndPasteHtmlTransfer.java index ad1c1cf..ef09b6a 100644 --- a/src/jalview/jbgui/GCutAndPasteHtmlTransfer.java +++ b/src/jalview/jbgui/GCutAndPasteHtmlTransfer.java @@ -20,9 +20,6 @@ */ package jalview.jbgui; -import jalview.gui.JvSwingUtils; -import jalview.util.MessageManager; - import java.awt.BorderLayout; import java.awt.Font; import java.awt.event.ActionEvent; @@ -41,6 +38,9 @@ import javax.swing.JScrollPane; import javax.swing.text.EditorKit; import javax.swing.text.html.HTMLEditorKit; +import jalview.gui.JvSwingUtils; +import jalview.util.MessageManager; + /** * DOCUMENT ME! * @@ -103,6 +103,7 @@ public class GCutAndPasteHtmlTransfer extends JInternalFrame */ private void jbInit() throws Exception { + setFrameIcon(null); scrollPane.setBorder(null); ok.setFont(JvSwingUtils.getLabelFont()); ok.setText(MessageManager.getString("label.new_window")); diff --git a/src/jalview/jbgui/GCutAndPasteTransfer.java b/src/jalview/jbgui/GCutAndPasteTransfer.java index b75dd8c..3cd52ae 100755 --- a/src/jalview/jbgui/GCutAndPasteTransfer.java +++ b/src/jalview/jbgui/GCutAndPasteTransfer.java @@ -20,12 +20,8 @@ */ package jalview.jbgui; -import jalview.gui.JvSwingUtils; -import jalview.util.MessageManager; - import java.awt.BorderLayout; import java.awt.Font; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseEvent; @@ -39,6 +35,9 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextArea; +import jalview.gui.JvSwingUtils; +import jalview.util.MessageManager; + /** * DOCUMENT ME! * @@ -98,6 +97,7 @@ public class GCutAndPasteTransfer extends JInternalFrame */ private void jbInit() throws Exception { + setFrameIcon(null); scrollPane.setBorder(null); ok.setFont(JvSwingUtils.getLabelFont()); ok.setText(MessageManager.getString("label.new_window")); diff --git a/src/jalview/jbgui/GPCAPanel.java b/src/jalview/jbgui/GPCAPanel.java index a6498d2..cf7bc4e 100755 --- a/src/jalview/jbgui/GPCAPanel.java +++ b/src/jalview/jbgui/GPCAPanel.java @@ -20,9 +20,6 @@ */ package jalview.jbgui; -import jalview.util.ImageMaker.TYPE; -import jalview.util.MessageManager; - import java.awt.BorderLayout; import java.awt.Color; import java.awt.FlowLayout; @@ -43,6 +40,9 @@ import javax.swing.JPanel; import javax.swing.event.MenuEvent; import javax.swing.event.MenuListener; +import jalview.util.ImageMaker.TYPE; +import jalview.util.MessageManager; + public class GPCAPanel extends JInternalFrame { private static final Font VERDANA_12 = new Font("Verdana", 0, 12); @@ -88,6 +88,7 @@ public class GPCAPanel extends JInternalFrame private void jbInit() throws Exception { + setFrameIcon(null); setName("jalview-pca"); this.getContentPane().setLayout(new BorderLayout()); JPanel jPanel2 = new JPanel(); diff --git a/src/jalview/jbgui/GRnaStructureViewer.java b/src/jalview/jbgui/GRnaStructureViewer.java index 5dc726f..663245f 100644 --- a/src/jalview/jbgui/GRnaStructureViewer.java +++ b/src/jalview/jbgui/GRnaStructureViewer.java @@ -38,6 +38,7 @@ public class GRnaStructureViewer extends JInternalFrame private void jbInit() throws Exception { + setFrameIcon(null); setName("jalview-rnastructureviewer"); diff --git a/src/jalview/jbgui/GSplitFrame.java b/src/jalview/jbgui/GSplitFrame.java index 5e65047..4d531be 100644 --- a/src/jalview/jbgui/GSplitFrame.java +++ b/src/jalview/jbgui/GSplitFrame.java @@ -20,8 +20,6 @@ */ package jalview.jbgui; -import jalview.util.Platform; - import java.awt.Component; import java.awt.MouseInfo; import java.awt.Point; @@ -31,6 +29,8 @@ import javax.swing.JInternalFrame; import javax.swing.JSplitPane; import javax.swing.plaf.basic.BasicInternalFrameUI; +import jalview.util.Platform; + public class GSplitFrame extends JInternalFrame { protected static final int DIVIDER_SIZE = 5; @@ -57,6 +57,7 @@ public class GSplitFrame extends JInternalFrame */ public GSplitFrame(GAlignFrame top, GAlignFrame bottom) { + setFrameIcon(null); setName("jalview-splitframe"); this.topFrame = top; this.bottomFrame = bottom; diff --git a/src/jalview/jbgui/GStructureViewer.java b/src/jalview/jbgui/GStructureViewer.java index 4e13032..18e4c9f 100644 --- a/src/jalview/jbgui/GStructureViewer.java +++ b/src/jalview/jbgui/GStructureViewer.java @@ -88,7 +88,7 @@ public abstract class GStructureViewer extends JInternalFrame private void jbInit() throws Exception { - + setFrameIcon(null); setName("jalview-structureviewer"); JMenuBar menuBar = new JMenuBar(); diff --git a/src/jalview/jbgui/GTreePanel.java b/src/jalview/jbgui/GTreePanel.java index d184e76..2a1b11f 100755 --- a/src/jalview/jbgui/GTreePanel.java +++ b/src/jalview/jbgui/GTreePanel.java @@ -20,9 +20,6 @@ */ package jalview.jbgui; -import jalview.util.ImageMaker.TYPE; -import jalview.util.MessageManager; - import java.awt.BorderLayout; import java.awt.Color; import java.awt.event.ActionEvent; @@ -37,6 +34,9 @@ import javax.swing.JScrollPane; import javax.swing.event.MenuEvent; import javax.swing.event.MenuListener; +import jalview.util.ImageMaker.TYPE; +import jalview.util.MessageManager; + @SuppressWarnings("serial") public class GTreePanel extends JInternalFrame { @@ -92,6 +92,7 @@ public class GTreePanel extends JInternalFrame private void jbInit() throws Exception { + setFrameIcon(null); setName("jalview-tree"); this.getContentPane().setLayout(borderLayout1); this.setBackground(Color.white); -- 1.7.10.2