From: amwaterhouse <Andrew Waterhouse>
Date: Thu, 5 Oct 2006 16:18:50 +0000 (+0000)
Subject: AlignFrame must take width and height
X-Git-Tag: Release_2_2~321
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4822456539ebf9fe5a5b0fb2728f52465418e4fc;p=jalview.git

AlignFrame must take width and height
---

diff --git a/src/jalview/ws/JPredClient.java b/src/jalview/ws/JPredClient.java
index 55e65a5..2713078 100755
--- a/src/jalview/ws/JPredClient.java
+++ b/src/jalview/ws/JPredClient.java
@@ -720,7 +720,10 @@ public class JPredClient
           {
             AlignFrame af;
            if (input==null) {
-             af = new AlignFrame(res);
+             af = new AlignFrame(res,
+                                 AlignFrame.DEFAULT_WIDTH,
+                                 AlignFrame.DEFAULT_HEIGHT);
+
            } else {
              java.lang.Object[] alandcolsel = input.getAlignmentAndColumnSelection(alignFrame.getViewport().getGapCharacter());
 
@@ -732,11 +735,13 @@ public class JPredClient
                  ((ColumnSelection) alandcolsel[1]).pruneDeletions(ShiftList.parseMap(((SequenceI[]) alandcolsel[0])[0].gapMap()));//gapMap returns insert list, interpreted as delete list by pruneDeletions
                }
              }
-             af = new AlignFrame(res, (ColumnSelection) alandcolsel[1]);
+             af = new AlignFrame(res, (ColumnSelection) alandcolsel[1],
+                                           AlignFrame.DEFAULT_WIDTH,
+                                           AlignFrame.DEFAULT_HEIGHT);
            }
             Desktop.addInternalFrame(af, altitle,
-                                     AlignFrame.NEW_WINDOW_WIDTH,
-                                     AlignFrame.NEW_WINDOW_HEIGHT);
+                                     AlignFrame.DEFAULT_WIDTH,
+                                     AlignFrame.DEFAULT_HEIGHT);
           }
           else
           {
diff --git a/src/jalview/ws/MsaWSThread.java b/src/jalview/ws/MsaWSThread.java
index fb82808..2946ba8 100644
--- a/src/jalview/ws/MsaWSThread.java
+++ b/src/jalview/ws/MsaWSThread.java
@@ -619,7 +619,9 @@ class MsaWSThread
 
     if (newFrame)
     {
-      AlignFrame af = new AlignFrame(al, columnselection);
+      AlignFrame af = new AlignFrame(al, columnselection,
+                                           AlignFrame.DEFAULT_WIDTH,
+                                           AlignFrame.DEFAULT_HEIGHT);
 
       // >>>This is a fix for the moment, until a better solution is
       // found!!<<<
@@ -677,8 +679,8 @@ class MsaWSThread
       }
 
       Desktop.addInternalFrame(af, alTitle,
-                               AlignFrame.NEW_WINDOW_WIDTH,
-                               AlignFrame.NEW_WINDOW_HEIGHT);
+                               AlignFrame.DEFAULT_WIDTH,
+                               AlignFrame.DEFAULT_HEIGHT);
 
     }
     else