From: jprocter <Jim Procter>
Date: Wed, 25 Apr 2007 15:41:25 +0000 (+0000)
Subject: getContentPane().add alignmentProperties popup.
X-Git-Tag: Release_2_3~173
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=28aba3836346a81a1fe5514f59aa77f2579e64ff;p=jalview.git

getContentPane().add alignmentProperties popup.
---

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index bcb5771..edd8cec 100755
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -1311,7 +1311,7 @@ public class AlignFrame
       return;
     }
     //  TODO: preserve the ordering of displayed alignment annotation in any internal paste (particularly sequence associated annotation)
-    SequenceI [] seqs = viewport.getSelectionAsNewSequence();  
+    SequenceI [] seqs = viewport.getSelectionAsNewSequence();
     String[] omitHidden = null;
 
     if (viewport.hasHiddenColumns)
@@ -1478,7 +1478,7 @@ public class AlignFrame
 
      if (newAlignment)
      {
-       
+
        if (Desktop.jalviewClipboard != null)
        {
          // dataset is inherited
@@ -1504,10 +1504,10 @@ public class AlignFrame
         // an existing alignment
         Vector newDs = (importDs) ? new Vector() : null; // used to create
                                                           // minimum dataset set
-        
+
         for (int i = 0; i < sequences.length; i++)
         {
-          if (importDs) 
+          if (importDs)
           {
             newDs.addElement(null);
           }
@@ -1517,7 +1517,7 @@ public class AlignFrame
           {
             if (!newDs.contains(ds))
             {
-              newDs.setElementAt(ds, i); 
+              newDs.setElementAt(ds, i);
               ds = new Sequence(ds);
               // update with new dataset sequence
               sequences[i].setDatasetSequence(ds);
@@ -1582,7 +1582,7 @@ public class AlignFrame
            alignment.setAnnotationIndex(sequences[i].getAnnotation()[a], a);
          }
 
-         
+
        }
      }
      if (!newAlignment) {
@@ -1611,7 +1611,7 @@ public class AlignFrame
        //>>>This is a fix for the moment, until a better solution is found!!<<<
        af.alignPanel.seqPanel.seqCanvas.getFeatureRenderer().transferSettings(
            alignPanel.seqPanel.seqCanvas.getFeatureRenderer());
-       
+
        // TODO: maintain provenance of an alignment, rather than just make the title a concatenation of operations.
        if (!externalPaste) {
          if (title.startsWith("Copied sequences"))
@@ -2306,7 +2306,7 @@ public class AlignFrame
     }
     editPane.setText(contents.toString()+"</html>");
     JInternalFrame frame = new JInternalFrame();
-    frame.add(editPane);
+    frame.getContentPane().add(editPane);
 
     Desktop.instance.addInternalFrame(frame,"Alignment Properties: "+getTitle(),500,400);
   }
@@ -3402,7 +3402,7 @@ public class AlignFrame
                 alignPanel.av.getSequenceSelection(),
                 alignPanel.alignFrame).fetchDBRefs(false);
       }
-      
+
     });
   }