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-3289 bamboo properties for ‘BUILD’ getdown channel - fix
[jalview.git]
/
src
/
jalview
/
appletgui
/
AlignFrame.java
diff --git
a/src/jalview/appletgui/AlignFrame.java
b/src/jalview/appletgui/AlignFrame.java
index
5ad212e
..
eb3be88
100644
(file)
--- a/
src/jalview/appletgui/AlignFrame.java
+++ b/
src/jalview/appletgui/AlignFrame.java
@@
-106,6
+106,7
@@
import java.awt.event.KeyListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.io.IOException;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.net.URLEncoder;
import java.util.Arrays;
import java.net.URL;
import java.net.URLEncoder;
import java.util.Arrays;
@@
-1447,14
+1448,12
@@
public class AlignFrame extends EmbmenuFrame implements ActionListener,
{
features = formatter.printJalviewFormat(
viewport.getAlignment().getSequencesArray(),
{
features = formatter.printJalviewFormat(
viewport.getAlignment().getSequencesArray(),
- getDisplayedFeatureCols(), null, getDisplayedFeatureGroups(),
- true);
+ alignPanel.getFeatureRenderer(), true);
}
else
{
features = formatter.printGffFormat(viewport.getAlignment()
}
else
{
features = formatter.printGffFormat(viewport.getAlignment()
- .getSequencesArray(), getDisplayedFeatureCols(),
- getDisplayedFeatureGroups(), true);
+ .getSequencesArray(), alignPanel.getFeatureRenderer(), true);
}
if (displayTextbox)
}
if (displayTextbox)
@@
-1571,7
+1570,7
@@
public class AlignFrame extends EmbmenuFrame implements ActionListener,
try
{
new URL(url);
try
{
new URL(url);
- url = URLEncoder.encode(url);
+ url = URLEncoder.encode(url, "UTF-8");
}
/*
* When we finally deprecate 1.1 compatibility, we can start to use
}
/*
* When we finally deprecate 1.1 compatibility, we can start to use
@@
-1584,6
+1583,13
@@
public class AlignFrame extends EmbmenuFrame implements ActionListener,
{
url = viewport.applet.getCodeBase() + url;
}
{
url = viewport.applet.getCodeBase() + url;
}
+ catch (UnsupportedEncodingException ex)
+ {
+ System.err.println(
+ "WARNING = IMPLEMENTATION ERROR - UNSUPPORTED ENCODING EXCEPTION FOR "
+ + url);
+ ex.printStackTrace();
+ }
return url;
}
return url;
}