X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Fio%2FHTMLOutput.java;h=5376fa4846bb73f0ac8f5acfe0abdee739b5a546;hp=3c31b7f340d0ccf0d7d8cd7870788c99c8d41f10;hb=67b3acb8df1438ef37a756c04e14f5a3b8406808;hpb=aa91e8c4561c2dd0f18760e18fb0052979733bf8 diff --git a/src/jalview/io/HTMLOutput.java b/src/jalview/io/HTMLOutput.java index 3c31b7f..5376fa4 100755 --- a/src/jalview/io/HTMLOutput.java +++ b/src/jalview/io/HTMLOutput.java @@ -20,14 +20,22 @@ */ package jalview.io; -import java.io.*; - -import java.awt.*; - -import jalview.datamodel.*; -import jalview.gui.*; +import jalview.bin.Cache; +import jalview.datamodel.AlignmentI; +import jalview.datamodel.SequenceI; +import jalview.gui.AlignViewport; +import jalview.gui.AlignmentPanel; +import jalview.gui.FeatureRenderer; +import jalview.gui.SequenceRenderer; +import jalview.util.BrowserLauncher; +import jalview.util.Comparison; +import jalview.util.Format; import jalview.util.MessageManager; +import java.awt.Color; +import java.awt.Font; +import java.io.PrintWriter; + public class HTMLOutput { AlignViewport av; @@ -48,7 +56,7 @@ public class HTMLOutput fr.transferSettings(fr1); JalviewFileChooser chooser = new JalviewFileChooser( - jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[] + Cache.getProperty("LAST_DIRECTORY"), new String[] { "html" }, new String[] { "HTML files" }, "HTML files"); @@ -61,7 +69,7 @@ public class HTMLOutput if (value == JalviewFileChooser.APPROVE_OPTION) { String choice = chooser.getSelectedFile().getPath(); - jalview.bin.Cache.setProperty("LAST_DIRECTORY", chooser + Cache.setProperty("LAST_DIRECTORY", chooser .getSelectedFile().getParent()); try @@ -102,7 +110,7 @@ public class HTMLOutput out.println("\n\n"); out.close(); - jalview.util.BrowserLauncher.openURL("file:///" + choice); + BrowserLauncher.openURL("file:///" + choice); } catch (Exception ex) { ex.printStackTrace(); @@ -143,7 +151,7 @@ public class HTMLOutput for (int res = 0; res < seq.getLength(); res++) { - if (!jalview.util.Comparison.isGap(seq.getCharAt(res))) + if (!Comparison.isGap(seq.getCharAt(res))) { color = sr.getResidueBoxColour(seq, res); @@ -156,9 +164,8 @@ public class HTMLOutput if (color.getRGB() < -1) { - out.println("" - + seq.getCharAt(res) + ""); + out.println("" + seq.getCharAt(res) + ""); } else { @@ -245,7 +252,7 @@ public class HTMLOutput for (int res = startRes; res < endRes; res++) { - if (!jalview.util.Comparison.isGap(seq.getCharAt(res))) + if (!Comparison.isGap(seq.getCharAt(res))) { color = sr.getResidueBoxColour(seq, res); @@ -258,9 +265,8 @@ public class HTMLOutput if (color.getRGB() < -1) { - out.println("" - + seq.getCharAt(res) + ""); + out.println("" + seq.getCharAt(res) + ""); } else {