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
FileFormatI further tweaks, clean compile
[jalview.git]
/
src
/
jalview
/
jbgui
/
GAlignFrame.java
diff --git
a/src/jalview/jbgui/GAlignFrame.java
b/src/jalview/jbgui/GAlignFrame.java
index
1eb558e
..
73d1b3c
100755
(executable)
--- a/
src/jalview/jbgui/GAlignFrame.java
+++ b/
src/jalview/jbgui/GAlignFrame.java
@@
-25,6
+25,7
@@
import jalview.api.SplitContainerI;
import jalview.bin.Cache;
import jalview.gui.JvSwingUtils;
import jalview.gui.Preferences;
import jalview.bin.Cache;
import jalview.gui.JvSwingUtils;
import jalview.gui.Preferences;
+import jalview.io.FileFormat;
import jalview.schemes.ColourSchemeProperty;
import jalview.util.MessageManager;
import jalview.schemes.ColourSchemeProperty;
import jalview.util.MessageManager;
@@
-55,7
+56,6
@@
import javax.swing.JPanel;
import javax.swing.JRadioButtonMenuItem;
import javax.swing.JTabbedPane;
import javax.swing.KeyStroke;
import javax.swing.JRadioButtonMenuItem;
import javax.swing.JTabbedPane;
import javax.swing.KeyStroke;
-import javax.swing.SwingUtilities;
import javax.swing.event.ChangeEvent;
import javax.swing.event.MenuEvent;
import javax.swing.event.MenuListener;
import javax.swing.event.ChangeEvent;
import javax.swing.event.MenuEvent;
import javax.swing.event.MenuListener;
@@
-137,8
+137,6
@@
public class GAlignFrame extends JInternalFrame
public JCheckBoxMenuItem showSeqFeatures = new JCheckBoxMenuItem();
public JCheckBoxMenuItem showSeqFeatures = new JCheckBoxMenuItem();
- public JCheckBoxMenuItem showSeqFeaturesHeight = new JCheckBoxMenuItem();
-
JMenuItem copy = new JMenuItem();
JMenuItem cut = new JMenuItem();
JMenuItem copy = new JMenuItem();
JMenuItem cut = new JMenuItem();
@@
-247,10
+245,9
@@
public class GAlignFrame extends JInternalFrame
setJMenuBar(alignFrameMenuBar);
// dynamically fill save as menu with available formats
setJMenuBar(alignFrameMenuBar);
// dynamically fill save as menu with available formats
- for (int i = 0; i < jalview.io.FormatAdapter.WRITEABLE_FORMATS.length; i++)
+ for (String ff : FileFormat.getWritableFormats())
{
{
- JMenuItem item = new JMenuItem(
- jalview.io.FormatAdapter.WRITEABLE_FORMATS[i]);
+ JMenuItem item = new JMenuItem(ff);
item.addActionListener(new ActionListener()
{
item.addActionListener(new ActionListener()
{
@@
-295,8
+292,7
@@
public class GAlignFrame extends JInternalFrame
@Override
public void mousePressed(MouseEvent evt)
{
@Override
public void mousePressed(MouseEvent evt)
{
- if (evt.isControlDown()
- || SwingUtilities.isRightMouseButton(evt))
+ if (evt.isPopupTrigger())
{
radioItem.removeActionListener(radioItem.getActionListeners()[0]);
{
radioItem.removeActionListener(radioItem.getActionListeners()[0]);
@@
-1593,7
+1589,7
@@
public class GAlignFrame extends JInternalFrame
});
JMenuItem modifyPID = new JMenuItem(
});
JMenuItem modifyPID = new JMenuItem(
- MessageManager.getString("label.modify_identity_thereshold"));
+ MessageManager.getString("label.modify_identity_threshold"));
modifyPID.addActionListener(new ActionListener()
{
@Override
modifyPID.addActionListener(new ActionListener()
{
@Override
@@
-1603,7
+1599,7
@@
public class GAlignFrame extends JInternalFrame
}
});
modifyConservation.setText(MessageManager
}
});
modifyConservation.setText(MessageManager
- .getString("label.modify_conservation_thereshold"));
+ .getString("label.modify_conservation_threshold"));
modifyConservation.addActionListener(new ActionListener()
{
@Override
modifyConservation.addActionListener(new ActionListener()
{
@Override
@@
-2522,13
+2518,6
@@
public class GAlignFrame extends JInternalFrame
}
}
- protected void showSeqFeaturesHeight_actionPerformed(
- ActionEvent actionEvent)
- {
- // TODO Auto-generated method stub
-
- }
-
protected void justifyRightMenuItem_actionPerformed(ActionEvent e)
{
// TODO Auto-generated method stub
protected void justifyRightMenuItem_actionPerformed(ActionEvent e)
{
// TODO Auto-generated method stub