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
jar inputstream provider enabling multiple jar entries to be unmarshalled without...
[jalview.git]
/
src
/
jalview
/
gui
/
Jalview2XML_V1.java
diff --git
a/src/jalview/gui/Jalview2XML_V1.java
b/src/jalview/gui/Jalview2XML_V1.java
index
ca2db7b
..
7bcea33
100755
(executable)
--- a/
src/jalview/gui/Jalview2XML_V1.java
+++ b/
src/jalview/gui/Jalview2XML_V1.java
@@
-28,6
+28,7
@@
import javax.swing.*;
import org.exolab.castor.xml.*;
\r
import jalview.binding.*;
\r
import jalview.schemes.*;
\r
import org.exolab.castor.xml.*;
\r
import jalview.binding.*;
\r
import jalview.schemes.*;
\r
+import jalview.util.jarInputStreamProvider;
\r
\r
/**
\r
* DOCUMENT ME!
\r
\r
/**
\r
* DOCUMENT ME!
\r
@@
-83,35
+84,20
@@
public class Jalview2XML_V1
* @param file
\r
* DOCUMENT ME!
\r
*/
\r
* @param file
\r
* DOCUMENT ME!
\r
*/
\r
- public AlignFrame LoadJalviewAlign(final String file)
\r
+ public AlignFrame LoadJalviewAlign(final jarInputStreamProvider jprovider)
\r
{
\r
{
\r
-
\r
+ final String file = jprovider.getFilename();
\r
jalview.gui.AlignFrame af = null;
\r
\r
try
\r
{
\r
jalview.gui.AlignFrame af = null;
\r
\r
try
\r
{
\r
- // UNMARSHALLER SEEMS TO CLOSE JARINPUTSTREAM, MOST ANNOYING
\r
- URL url = null;
\r
-
\r
- if (file.startsWith("http://"))
\r
- {
\r
- url = new URL(file);
\r
- }
\r
-
\r
JarInputStream jin = null;
\r
JarEntry jarentry = null;
\r
int entryCount = 1;
\r
\r
do
\r
{
\r
JarInputStream jin = null;
\r
JarEntry jarentry = null;
\r
int entryCount = 1;
\r
\r
do
\r
{
\r
- if (url != null)
\r
- {
\r
- jin = new JarInputStream(url.openStream());
\r
- }
\r
- else
\r
- {
\r
- jin = new JarInputStream(new FileInputStream(file));
\r
- }
\r
+ jin = jprovider.getJarInputStream();
\r
\r
for (int i = 0; i < entryCount; i++)
\r
{
\r
\r
for (int i = 0; i < entryCount; i++)
\r
{
\r