JAL-3390 pull-up refactoring towards functional changes...

[jalview.git] / src / jalview / gui / AlignFrame.java

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index fcb6572..c847260 100644 (file)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -398,8 +398,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
 
     addKeyListener();
 
-    final List<AlignmentPanel> selviews = new ArrayList<>();
-    final List<AlignmentPanel> origview = new ArrayList<>();
+    final List<AlignmentViewPanel> selviews = new ArrayList<>();
+    final List<AlignmentViewPanel> origview = new ArrayList<>();
     final String menuLabel = MessageManager
             .getString("label.copy_format_from");
     ViewSelectionMenu vsel = new ViewSelectionMenu(menuLabel,
@@ -407,7 +407,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
             {
 
               @Override
-              public AlignmentPanel[] getAllAlignmentPanels()
+              public AlignmentViewPanel[] getAllAlignmentPanels()
               {
                 origview.clear();
                 origview.add(alignPanel);
@@ -425,7 +425,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
               {
                 if (origview.size() > 0)
                 {
-                  final AlignmentPanel ap = origview.get(0);
+                  final AlignmentViewPanel avp = origview.get(0);
 
                   /*
                    * Copy the ViewStyle of the selected panel to 'this one'.
@@ -438,10 +438,10 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
                           .getAlignViewport().getCodingComplement() != null;
                   if (!fromSplitFrame)
                   {
-                    vs.setScaleProteinAsCdna(ap.getAlignViewport()
+                    vs.setScaleProteinAsCdna(avp.getAlignViewport()
                             .getViewStyle().isScaleProteinAsCdna());
                   }
-                  ap.getAlignViewport().setViewStyle(vs);
+                  avp.getAlignViewport().setViewStyle(vs);
 
                   /*
                    * Also rescale ViewStyle of SplitFrame complement if there is
@@ -449,7 +449,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
                    * the whole ViewStyle (allow cDNA protein to have different
                    * fonts)
                    */
-                  AlignViewportI complement = ap.getAlignViewport()
+                  AlignViewportI complement = avp.getAlignViewport()
                           .getCodingComplement();
                   if (complement != null && vs.isScaleProteinAsCdna())
                   {
@@ -459,10 +459,10 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
                     af.setMenusForViewport();
                   }
 
+                  AlignmentPanel ap = (AlignmentPanel) avp;
                   ap.updateLayout();
                   ap.setSelected(true);
                   ap.alignFrame.setMenusForViewport();
-
                 }
               }
             });