X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignViewport.java;fp=src%2Fjalview%2Fappletgui%2FAlignViewport.java;h=68d6c9044821eb2319878fba21d7910e646f893d;hb=a4677746324adeea9632d7306c83dfd94dff6181;hp=e4e3e1777a886f3ec492a021878d43b9c6a184fc;hpb=7d6575e94bed92bc06043d432576e3a39e8a8e75;p=jalview.git diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java index e4e3e17..68d6c90 100644 --- a/src/jalview/appletgui/AlignViewport.java +++ b/src/jalview/appletgui/AlignViewport.java @@ -36,7 +36,9 @@ import jalview.structure.CommandListener; import jalview.structure.SelectionSource; import jalview.structure.StructureSelectionManager; import jalview.structure.VamsasSource; +import jalview.util.Platform; import jalview.viewmodel.AlignmentViewport; +import jalview.workers.AlignCalcManager; import java.awt.Font; @@ -51,7 +53,7 @@ public class AlignViewport extends AlignmentViewport implements NJTree currentTree = null; - public jalview.bin.JalviewLite applet; + public JalviewLite applet; boolean MAC = false; @@ -68,7 +70,7 @@ public class AlignViewport extends AlignmentViewport implements public AlignViewport(AlignmentI al, JalviewLite applet) { super(); - calculator = new jalview.workers.AlignCalcManager(); + calculator = new AlignCalcManager(); this.applet = applet; alignment = al; // we always pad gaps @@ -129,7 +131,7 @@ public class AlignViewport extends AlignmentViewport implements } setFont(font); - MAC = new jalview.util.Platform().isAMac(); + MAC = Platform.isAMac(); if (applet != null) { @@ -338,8 +340,7 @@ public class AlignViewport extends AlignmentViewport implements @Override public StructureSelectionManager getStructureSelectionManager() { - return jalview.structure.StructureSelectionManager - .getStructureSelectionManager(applet); + return StructureSelectionManager.getStructureSelectionManager(applet); } /**