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
javadoc
[jalview.git]
/
src
/
jalview
/
gui
/
PopupMenu.java
diff --git
a/src/jalview/gui/PopupMenu.java
b/src/jalview/gui/PopupMenu.java
index
175adea
..
1c7be46
100644
(file)
--- a/
src/jalview/gui/PopupMenu.java
+++ b/
src/jalview/gui/PopupMenu.java
@@
-22,8
+22,6
@@
package jalview.gui;
import jalview.analysis.AAFrequency;
import jalview.analysis.AlignmentAnnotationUtils;
import jalview.analysis.AAFrequency;
import jalview.analysis.AlignmentAnnotationUtils;
-import jalview.analysis.AnnotationSorter;
-import jalview.analysis.AnnotationSorter.SortOrder;
import jalview.analysis.Conservation;
import jalview.commands.ChangeCaseCommand;
import jalview.commands.EditCommand;
import jalview.analysis.Conservation;
import jalview.commands.ChangeCaseCommand;
import jalview.commands.EditCommand;
@@
-1901,11
+1899,6
@@
public class PopupMenu extends JPopupMenu
copyAnn.visible = true;
}
}
copyAnn.visible = true;
}
}
- // TODO: save annotation sort order on AlignViewport
- // do sorting from AlignmentPanel.updateAnnotation()
- new AnnotationSorter(this.ap.getAlignment()).sort(this.ap
- .getAlignment().getAlignmentAnnotation(),
- SortOrder.SEQUENCE_AND_TYPE);
refresh();
}
refresh();
}
@@
-2573,7
+2566,8
@@
public class PopupMenu extends JPopupMenu
String choice = chooser.getSelectedFile().getPath();
jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);
new AssociatePdbFileWithSeq().associatePdbWithSeq(choice,
String choice = chooser.getSelectedFile().getPath();
jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);
new AssociatePdbFileWithSeq().associatePdbWithSeq(choice,
- jalview.io.AppletFormatAdapter.FILE, sequence, true);
+ jalview.io.AppletFormatAdapter.FILE, sequence, true,
+ Desktop.instance);
}
}
}
}