summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
cedd8bb)
Release_2_8_2_Branch only for JAL-1469 -removed changes to BioJS importer
code
Conflicts:
.classpath
src/jalview/io/HtmlFile.java
-import java.awt.FlowLayout;
-import java.awt.Frame;
+import jalview.gui.AlignFrame;
+import jalview.gui.Desktop;
+import jalview.util.MessageManager;
+import jalview.util.Platform;
+
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.BufferedReader;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.BufferedReader;
import java.security.PermissionCollection;
import java.security.Permissions;
import java.security.Policy;
import java.security.PermissionCollection;
import java.security.Permissions;
import java.security.Policy;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Vector;
-import javax.swing.*;
-
-import jalview.gui.*;
-import jalview.util.MessageManager;
-import jalview.util.Platform;
+import javax.swing.UIManager;
/**
* Main class for Jalview Application <br>
/**
* Main class for Jalview Application <br>
{
FeatureFetcher ff = startFeatureFetching(getFeatures);
if (ff != null)
{
FeatureFetcher ff = startFeatureFetching(getFeatures);
if (ff != null)
while (!ff.allFinished() || af.operationInProgress())
{
// wait around until fetching is finished.
while (!ff.allFinished() || af.operationInProgress())
{
// wait around until fetching is finished.
getFeatures = null; // have retrieved features - forget them now.
}
if (groovyscript != null)
getFeatures = null; // have retrieved features - forget them now.
}
if (groovyscript != null)
System.out.println("Creating PNG image: " + file);
continue;
}
System.out.println("Creating PNG image: " + file);
continue;
}
+ else if (format.equalsIgnoreCase("svg"))
+ {
+ File imageFile = new java.io.File(file);
+ imageName = imageFile.getName();
+ af.createSVG(imageFile);
+ System.out.println("Creating SVG image: " + file);
+ continue;
+ }
else if (format.equalsIgnoreCase("imgMap"))
{
af.createImageMap(new java.io.File(file), imageName);
else if (format.equalsIgnoreCase("imgMap"))
{
af.createImageMap(new java.io.File(file), imageName);