X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAppJmolBinding.java;h=1c54a5e35d1728e516c122e9016adb5197147f8d;hb=e879efcd79694e43a8081c9235a13740cb429076;hp=12830193fd6fb007b1d726f7a05fce3d1fc15d2f;hpb=f59ae49cdd2bb8f6721424ea6ce167e8245e7d15;p=jalview.git diff --git a/src/jalview/gui/AppJmolBinding.java b/src/jalview/gui/AppJmolBinding.java index 1283019..1c54a5e 100644 --- a/src/jalview/gui/AppJmolBinding.java +++ b/src/jalview/gui/AppJmolBinding.java @@ -32,7 +32,6 @@ import java.util.Map; import org.jmol.api.JmolAppConsoleInterface; import org.jmol.java.BS; -import org.jmol.popup.JmolAwtPopup; import org.openscience.jmol.app.jmolpanel.console.AppConsole; public class AppJmolBinding extends JalviewJmolBinding @@ -50,11 +49,10 @@ public class AppJmolBinding extends JalviewJmolBinding } @Override - public FeatureRenderer getFeatureRenderer( - AlignmentViewPanel alignment) + public FeatureRenderer getFeatureRenderer(AlignmentViewPanel alignment) { - AlignmentPanel ap = (alignment == null) ? appJmolWindow.getAlignmentPanel() - : (AlignmentPanel) alignment; + AlignmentPanel ap = (alignment == null) ? appJmolWindow + .getAlignmentPanel() : (AlignmentPanel) alignment; if (ap.av.isShowSequenceFeatures()) { if (fr == null) @@ -71,8 +69,7 @@ public class AppJmolBinding extends JalviewJmolBinding } @Override - public SequenceRenderer getSequenceRenderer( - AlignmentViewPanel alignment) + public SequenceRenderer getSequenceRenderer(AlignmentViewPanel alignment) { return new SequenceRenderer(((AlignmentPanel) alignment).av); } @@ -126,7 +123,7 @@ public class AppJmolBinding extends JalviewJmolBinding public void updateColours(Object source) { - AlignmentPanel ap = (AlignmentPanel) source, topap; + AlignmentPanel ap = (AlignmentPanel) source; // ignore events from panels not used to colour this view if (!appJmolWindow.isUsedforcolourby(ap)) { @@ -134,7 +131,7 @@ public class AppJmolBinding extends JalviewJmolBinding } if (!isLoadingFromArchive()) { - colourBySequence(ap.av.isShowSequenceFeatures(), ap); + colourBySequence(ap); } } @@ -154,8 +151,8 @@ public class AppJmolBinding extends JalviewJmolBinding public void newJmolPopup(String menuName) { - jmolpopup = new JmolAwtPopup(); - jmolpopup.jpiInitialize((viewer), menuName); + // jmolpopup = new JmolAwtPopup(); + // jmolpopup.jpiInitialize((viewer), menuName); } @Override