X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignFrame.java;h=73872d0ac6a099e758fd7bca40216b75914a3321;hb=d86deeaf2bf1128ff2d4e610c9a715c9970fb3ad;hp=fe6f4cf9eed7610eaf88a1a30d02fa06fd67ede1;hpb=f7209385ed929337d8a4259981700f2bd7a8bbba;p=jalview.git diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index fe6f4cf..73872d0 100755 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -44,8 +44,7 @@ import org.biojava.dasobert.eventmodel.*; * @author $author$ * @version $Revision$ */ -public class AlignFrame - extends GAlignFrame implements DropTargetListener, FeatureListener +public class AlignFrame extends GAlignFrame implements DropTargetListener { /** DOCUMENT ME!! */ public static final int DEFAULT_WIDTH = 700; @@ -115,15 +114,14 @@ public class AlignFrame { this.setDropTarget(new java.awt.dnd.DropTarget(this, this)); - if (viewport.hconsensus == null) + if (viewport.conservation == null) { - //Out of memory calculating consensus. BLOSUM62Colour.setEnabled(false); - PIDColour.setEnabled(false); conservationMenuItem.setEnabled(false); modifyConservation.setEnabled(false); - abovePIDThreshold.setEnabled(false); - modifyPID.setEnabled(false); + // PIDColour.setEnabled(false); + // abovePIDThreshold.setEnabled(false); + // modifyPID.setEnabled(false); } String sortby = jalview.bin.Cache.getDefault("SORT_ALIGNMENT", "No sort"); @@ -490,17 +488,6 @@ public class AlignFrame } } - public void comeBackLater(FeatureEvent evt) - {} - - public void newFeatures(FeatureEvent evt) - { - if (evt.getFeatures().length > 0) - { - alignPanel.seqPanel.seqCanvas.fr.featuresAdded(); - alignPanel.repaint(); - } - } Hashtable progressBars; public void setProgressBar(String message, long id) @@ -541,6 +528,8 @@ public class AlignFrame } + + /* Added so Castor Mapping file can obtain Jalview Version */