X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fproject%2FJalview2XML.java;h=646cab56979e1da0be1b44a86bc9fa4842efb4cd;hb=8ff6ad0a4030c6e8d816cb086aababfce4eaeb17;hp=47a07a006f4ac8aa6bd632a2b3b6182ab0c4456a;hpb=a0c8e3d13060b488169f1398933e0d8c8c72364f;p=jalview.git

diff --git a/src/jalview/project/Jalview2XML.java b/src/jalview/project/Jalview2XML.java
index 47a07a0..646cab5 100644
--- a/src/jalview/project/Jalview2XML.java
+++ b/src/jalview/project/Jalview2XML.java
@@ -2549,14 +2549,14 @@ public class Jalview2XML
 				@Override
 				public JarInputStream getJarInputStream() throws IOException {
 					if (bytes != null) {
-						System.out.println("Jalview2XML: opening byte jarInputStream for bytes.length=" + bytes.length);
+//						System.out.println("Jalview2XML: opening byte jarInputStream for bytes.length=" + bytes.length);
 						return new JarInputStream(new ByteArrayInputStream(bytes));
 					}
 					if (_url != null) {
-						System.out.println("Jalview2XML: opening url jarInputStream for " + _url);
+//						System.out.println("Jalview2XML: opening url jarInputStream for " + _url);
 						return new JarInputStream(_url.openStream());
 					} else {
-						System.out.println("Jalview2XML: opening file jarInputStream for " + file);
+//						System.out.println("Jalview2XML: opening file jarInputStream for " + file);
 						return new JarInputStream(new FileInputStream(file));
 					}
 				}
@@ -2608,14 +2608,10 @@ public class Jalview2XML
         for (int i = 0; i < entryCount; i++)
         {
           jarentry = jin.getNextJarEntry();
-          System.out.println("Jalview2XML#loadJalviewAlign: jarentry=" + (jarentry == null ? null : jarentry.getName()));
         }
 
         if (jarentry != null && jarentry.getName().endsWith(".xml"))
         {
-          InputStreamReader in = new InputStreamReader(jin, UTF_8);
-          // JalviewModel object = new JalviewModel();
-
           JAXBContext jc = JAXBContext
                   .newInstance("jalview.xml.binding.jalview");
           XMLStreamReader streamReader = XMLInputFactory.newInstance()
@@ -2624,12 +2620,7 @@ public class Jalview2XML
           JAXBElement<JalviewModel> jbe = um
                   .unmarshal(streamReader, JalviewModel.class);
           JalviewModel object = jbe.getValue();
-          System.out.println("processing JalviewModel object=" + object);
-          /*
-          Unmarshaller unmar = new Unmarshaller(object);
-          unmar.setValidation(false);
-          object = (JalviewModel) unmar.unmarshal(in);
-          */
+
           if (true) // !skipViewport(object))
           {
             _af = loadFromObject(object, file, true, jprovider);
@@ -2971,7 +2962,6 @@ public class Jalview2XML
       do
       {
         entry = jin.getNextJarEntry();
-      	System.out.println("Jalview2XML#copyJarEntry: jarentry=" + (entry == null ? null : entry.getName()));
       } while (entry != null && !entry.getName().equals(jarEntryName));
       if (entry != null)
       {
@@ -4612,7 +4602,18 @@ public class Jalview2XML
   {
     AlignFrame af = null;
     af = new AlignFrame(al, safeInt(view.getWidth()),
-            safeInt(view.getHeight()), uniqueSeqSetId, viewId);
+            safeInt(view.getHeight()), uniqueSeqSetId, viewId) 
+//    {
+//    	
+//    	@Override
+//    	protected void processKeyEvent(java.awt.event.KeyEvent e) {
+//    		System.out.println("Jalview2XML   AF " + e);
+//    		super.processKeyEvent(e);
+//    		
+//    	}
+//    	
+//    }
+    ;
 
     af.setFileName(file, FileFormat.Jalview);
 
@@ -5809,7 +5810,6 @@ public class Jalview2XML
       do
       {
         entry = jin.getNextJarEntry();
-      	System.out.println("Jalview2XML#readJarEntry: jarentry=" + (entry == null ? null : entry.getName()));
       } while (entry != null && !entry.getName().equals(jarEntryName));
 
       if (entry != null)