From aac9e5a2d05c6947c237f84a3a4b9dcdf956ceec Mon Sep 17 00:00:00 2001 From: gmungoc Date: Thu, 4 Apr 2019 20:45:19 +0100 Subject: [PATCH] JAL-3220 j2sIgnore on 3 more main methods --- src/jalview/io/JPredFile.java | 3 +-- src/jalview/util/AWTConsole.java | 25 ++++++++++++++++---- .../jmol/JmolVsJalviewPDBParserEndToEndTest.java | 7 +++++- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/src/jalview/io/JPredFile.java b/src/jalview/io/JPredFile.java index a944f38..e375df7 100755 --- a/src/jalview/io/JPredFile.java +++ b/src/jalview/io/JPredFile.java @@ -363,10 +363,9 @@ public class JPredFile extends AlignFile } /** - * DOCUMENT ME! * * @param args - * DOCUMENT ME! + * @j2sIgnore */ public static void main(String[] args) { diff --git a/src/jalview/util/AWTConsole.java b/src/jalview/util/AWTConsole.java index 6698414..9286794 100644 --- a/src/jalview/util/AWTConsole.java +++ b/src/jalview/util/AWTConsole.java @@ -72,10 +72,10 @@ public class AWTConsole extends WindowAdapter // create all components and add them frame = new Frame("Java Console"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - Dimension frameSize = new Dimension((int) (screenSize.width / 2), - (int) (screenSize.height / 2)); - int x = (int) (frameSize.width / 2); - int y = (int) (frameSize.height / 2); + Dimension frameSize = new Dimension(screenSize.width / 2, + screenSize.height / 2); + int x = frameSize.width / 2; + int y = frameSize.height / 2; frame.setBounds(x, y, frameSize.width, frameSize.height); textArea = new TextArea(); @@ -142,7 +142,9 @@ public class AWTConsole extends WindowAdapter .getLocalGraphicsEnvironment(); String[] fontNames = ge.getAvailableFontFamilyNames(); for (int n = 0; n < fontNames.length; n++) + { System.out.println(fontNames[n]); + } // Testing part: simple an error thrown anywhere in this JVM will be printed // on the Console // We do it with a seperate Thread becasue we don't wan't to break a Thread @@ -153,6 +155,7 @@ public class AWTConsole extends WindowAdapter errorThrower.start(); } + @Override public synchronized void windowClosed(WindowEvent evt) { quit = true; @@ -174,17 +177,20 @@ public class AWTConsole extends WindowAdapter System.exit(0); } + @Override public synchronized void windowClosing(WindowEvent evt) { frame.setVisible(false); // default behaviour of JFrame frame.dispose(); } + @Override public synchronized void actionPerformed(ActionEvent evt) { textArea.setText(""); } + @Override public synchronized void run() { try @@ -203,7 +209,9 @@ public class AWTConsole extends WindowAdapter textArea.append(input); } if (quit) + { return; + } } while (Thread.currentThread() == reader2) @@ -220,7 +228,9 @@ public class AWTConsole extends WindowAdapter textArea.append(input); } if (quit) + { return; + } } } catch (Exception e) { @@ -251,7 +261,9 @@ public class AWTConsole extends WindowAdapter { int available = in.available(); if (available == 0) + { break; + } byte b[] = new byte[available]; in.read(b); input = input + new String(b, 0, b.length); @@ -259,6 +271,11 @@ public class AWTConsole extends WindowAdapter return input; } + /** + * + * @param arg + * @j2sIgnore + */ public static void main(String[] arg) { new AWTConsole(); // create console with not reference diff --git a/test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java b/test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java index 4c6fe44..382e208 100644 --- a/test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java +++ b/test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java @@ -53,6 +53,11 @@ public class JmolVsJalviewPDBParserEndToEndTest JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); } + /** + * + * @param args + * @j2sIgnore + */ public static void main(String[] args) { if (args == null || args[0] == null) @@ -72,7 +77,7 @@ public class JmolVsJalviewPDBParserEndToEndTest public static void testFileParser(String testDir, String[] testFiles) { - Set failedFiles = new HashSet(); + Set failedFiles = new HashSet<>(); int totalSeqScanned = 0, totalFail = 0; for (String pdbStr : testFiles) { -- 1.7.10.2