X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJalview2XML_V1.java;h=61e20faa9124d3ea8da4bc4c0b28792acb9186d4;hb=ba74c240931531706fd2f95bde111033e513e71e;hp=cb572cdc77b2d5ca664d89590f3ebed1fd1c3b49;hpb=bc27e1b604af729b363da1f29bdd5774ca79f4e4;p=jalview.git

diff --git a/src/jalview/gui/Jalview2XML_V1.java b/src/jalview/gui/Jalview2XML_V1.java
index cb572cd..61e20fa 100755
--- a/src/jalview/gui/Jalview2XML_V1.java
+++ b/src/jalview/gui/Jalview2XML_V1.java
@@ -44,6 +44,8 @@ import jalview.util.jarInputStreamProvider;
 import jalview.viewmodel.seqfeatures.FeatureRendererSettings;
 
 import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.UnknownHostException;
 import java.util.Hashtable;
 import java.util.Vector;
 import java.util.jar.JarEntry;
@@ -51,8 +53,6 @@ import java.util.jar.JarInputStream;
 
 import javax.swing.JOptionPane;
 
-import org.exolab.castor.xml.IDResolver;
-
 /**
  * DOCUMENT ME!
  * 
@@ -127,33 +127,29 @@ public class Jalview2XML_V1
           jarentry = jin.getNextJarEntry();
         }
 
-        class NoDescIDResolver implements IDResolver
-        {
-          public Object resolve(String idref)
-          {
-            System.out.println(idref + " used");
-            return null;
-          }
-        }
-
         if (jarentry != null)
         {
-          InputStreamReader in = new InputStreamReader(jin, "UTF-8");
-          JalviewModel object = new JalviewModel();
+          entryCount++;
+          if (jarentry.getName().endsWith(".xml"))
+          {
+            Reader in = new InputStreamReader(jin, "UTF-8");
+            JalviewModel object = new JalviewModel();
 
-          object = object.unmarshal(in);
+            object = object.unmarshal(in);
 
-          af = LoadFromObject(object, file);
-          entryCount++;
+            af = LoadFromObject(object, file);
+          }
         }
+        jin.close();
       } while (jarentry != null);
-    } catch (final java.net.UnknownHostException ex)
+    } catch (final UnknownHostException ex)
     {
       ex.printStackTrace();
       if (raiseGUI)
       {
         javax.swing.SwingUtilities.invokeLater(new Runnable()
         {
+          @Override
           public void run()
           {
 
@@ -161,8 +157,7 @@ public class Jalview2XML_V1
                     + "\n");
             JOptionPane.showInternalMessageDialog(Desktop.desktop,
                     MessageManager.formatMessage("label.couldnt_locate",
-                            new String[]
-                            { file }), MessageManager
+                            new String[] { file }), MessageManager
                             .getString("label.url_not_found"),
                     JOptionPane.WARNING_MESSAGE);
           }
@@ -177,11 +172,15 @@ public class Jalview2XML_V1
       {
         javax.swing.SwingUtilities.invokeLater(new Runnable()
         {
+          @Override
           public void run()
           {
 
             JOptionPane.showInternalMessageDialog(Desktop.desktop,
-                    MessageManager.formatMessage("label.error_loading_file_params", new String[]{file}), MessageManager.getString("label.error_loading_jalview_file"),
+                    MessageManager.formatMessage(
+                            "label.error_loading_file_params", new String[]
+                            { file }), MessageManager
+                            .getString("label.error_loading_jalview_file"),
                     JOptionPane.WARNING_MESSAGE);
           }
         });
@@ -348,8 +347,7 @@ public class Jalview2XML_V1
 
         for (int s = 0; s < ids.length; s++)
         {
-          seqs.addElement(seqids
-                  .elementAt(ids[s]));
+          seqs.addElement(seqids.elementAt(ids[s]));
         }
 
         jalview.datamodel.SequenceGroup sg = new jalview.datamodel.SequenceGroup(
@@ -435,19 +433,21 @@ public class Jalview2XML_V1
       {
         Setting setting = jms.getFeatureSettings().getSetting(fs);
 
-        featureColours.put(
-                setting.getType(), new java.awt.Color(setting.getColour()));
+        featureColours.put(setting.getType(),
+                new java.awt.Color(setting.getColour()));
 
         renderOrder[fs] = setting.getType();
 
         if (setting.getDisplay())
         {
-          featuresDisplayed.put(setting.getType(), new Integer(
-                  setting.getColour()));
+          featuresDisplayed.put(setting.getType(),
+                  new Integer(setting.getColour()));
         }
       }
-      FeatureRendererSettings frs = new FeatureRendererSettings(renderOrder, new Hashtable(), featureColours, 1.0f, null);
-      af.alignPanel.getSeqPanel().seqCanvas.getFeatureRenderer().transferSettings(frs);
+      FeatureRendererSettings frs = new FeatureRendererSettings(
+              renderOrder, new Hashtable(), featureColours, 1.0f, null);
+      af.alignPanel.getSeqPanel().seqCanvas.getFeatureRenderer()
+              .transferSettings(frs);
     }
 
     af.setMenusFromViewport(af.viewport);