git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-4102 whatsNew for 2.11.2.6
[jalview.git]
/
src
/
jalview
/
io
/
HTMLOutput.java
diff --git
a/src/jalview/io/HTMLOutput.java
b/src/jalview/io/HTMLOutput.java
index
54e7e4b
..
eb44180
100644
(file)
--- a/
src/jalview/io/HTMLOutput.java
+++ b/
src/jalview/io/HTMLOutput.java
@@
-20,6
+20,13
@@
*/
package jalview.io;
*/
package jalview.io;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.Objects;
+
import jalview.api.AlignExportSettingsI;
import jalview.bin.Cache;
import jalview.datamodel.AlignExportSettingsAdapter;
import jalview.api.AlignExportSettingsI;
import jalview.bin.Cache;
import jalview.datamodel.AlignExportSettingsAdapter;
@@
-28,13
+35,6
@@
import jalview.gui.AlignmentPanel;
import jalview.gui.IProgressIndicator;
import jalview.util.MessageManager;
import jalview.gui.IProgressIndicator;
import jalview.util.MessageManager;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.Objects;
-
public abstract class HTMLOutput implements Runnable
{
protected AlignmentPanel ap;
public abstract class HTMLOutput implements Runnable
{
protected AlignmentPanel ap;
@@
-59,7
+59,7
@@
public abstract class HTMLOutput implements Runnable
* Constructor given an alignment panel (which should not be null)
*
* @param ap
* Constructor given an alignment panel (which should not be null)
*
* @param ap
- * @param desc
+ * @param desc
*/
public HTMLOutput(AlignmentPanel ap, String desc)
{
*/
public HTMLOutput(AlignmentPanel ap, String desc)
{
@@
-261,14
+261,17
@@
public abstract class HTMLOutput implements Runnable
{
if (isLaunchInBrowserAfterExport() && !isHeadless())
{
{
if (isLaunchInBrowserAfterExport() && !isHeadless())
{
+ /*
try
{
try
{
- jalview.util.BrowserLauncher
- .openURL("file:///" + getExportedFile());
+ */
+ jalview.util.BrowserLauncher.openURL("file:///" + getExportedFile());
+ /*
} catch (IOException e)
{
e.printStackTrace();
}
} catch (IOException e)
{
e.printStackTrace();
}
+ */
}
}
}
}
@@
-301,7
+304,7
@@
public abstract class HTMLOutput implements Runnable
public void exportHTML(String outputFile)
{
setProgressMessage(MessageManager.formatMessage(
public void exportHTML(String outputFile)
{
setProgressMessage(MessageManager.formatMessage(
- "status.exporting_alignment_as_x_file", getDescription()));
+ "status.exporting_alignment_as_x_file", getDescription()));
try
{
if (outputFile == null)
try
{
if (outputFile == null)
@@
-327,7
+330,7
@@
public abstract class HTMLOutput implements Runnable
return;
}
new Thread(this).start();
return;
}
new Thread(this).start();
-
+
}
/**
}
/**
@@
-338,6
+341,6
@@
public abstract class HTMLOutput implements Runnable
*/
protected final String getDescription()
{
*/
protected final String getDescription()
{
- return description;
+ return description;
}
}
\ No newline at end of file
}
}
\ No newline at end of file