git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Uses RemoveGapsCommand
[jalview.git]
/
src
/
jalview
/
gui
/
AlignFrame.java
diff --git
a/src/jalview/gui/AlignFrame.java
b/src/jalview/gui/AlignFrame.java
index
fe6f4cf
..
73872d0
100755
(executable)
--- 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$
*/
* @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;
{
/** 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));
{
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);
BLOSUM62Colour.setEnabled(false);
- PIDColour.setEnabled(false);
conservationMenuItem.setEnabled(false);
modifyConservation.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");
}
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)
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
*/
/*
Added so Castor Mapping file can obtain Jalview Version
*/