Jalview-JS/JAL-3253-applet fix for original desktop, centralizing regex

[jalview.git] / src / jalview / project / Jalview2XML.java

diff --git a/src/jalview/project/Jalview2XML.java b/src/jalview/project/Jalview2XML.java
index 9d9faa1..801632f 100644 (file)
--- a/src/jalview/project/Jalview2XML.java
+++ b/src/jalview/project/Jalview2XML.java
@@ -2854,8 +2854,10 @@ public class Jalview2XML
         {
           jarentry = jin.getNextJarEntry();
         }
-
-        if (jarentry != null && jarentry.getName().endsWith(".xml"))
+        String name = (jarentry == null ? null : jarentry.getName());
+        if (name != null && name.endsWith(".xml")
+                && name.indexOf(" Dataset for ") < 0 // BH 2019.05.21
+        )
         {
           JAXBContext jc = JAXBContext
                   .newInstance("jalview.xml.binding.jalview");
@@ -4973,8 +4975,18 @@ public class Jalview2XML
       viewport.setViewName(view.getViewName());
       af.setInitialTabVisible();
     }
-    af.setBounds(safeInt(view.getXpos()), safeInt(view.getYpos()),
-            safeInt(view.getWidth()), safeInt(view.getHeight()));
+    int x = safeInt(view.getXpos());
+    int y = safeInt(view.getYpos());
+    int w = safeInt(view.getWidth());
+    int h = safeInt(view.getHeight());
+    // // BH we cannot let the title bar go off the top
+    // if (Platform.isJS())
+    // {
+    // x = Math.max(50 - w, x);
+    // y = Math.max(0, y);
+    // }
+
+    af.setBounds(x, y, w, h);
     // startSeq set in af.alignPanel.updateLayout below
     af.alignPanel.updateLayout();
     ColourSchemeI cs = null;