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
JavaScript browser-based JSON parsing
[jalview.git]
/
src
/
jalview
/
jbgui
/
GAlignFrame.java
diff --git
a/src/jalview/jbgui/GAlignFrame.java
b/src/jalview/jbgui/GAlignFrame.java
index
a5c2a36
..
15d5713
100755
(executable)
--- a/
src/jalview/jbgui/GAlignFrame.java
+++ b/
src/jalview/jbgui/GAlignFrame.java
@@
-23,6
+23,7
@@
package jalview.jbgui;
import jalview.analysis.AnnotationSorter.SequenceAnnotationOrder;
import jalview.api.SplitContainerI;
import jalview.bin.Cache;
import jalview.analysis.AnnotationSorter.SequenceAnnotationOrder;
import jalview.api.SplitContainerI;
import jalview.bin.Cache;
+import jalview.bin.Jalview;
import jalview.gui.JvSwingUtils;
import jalview.gui.Preferences;
import jalview.io.FileFormats;
import jalview.gui.JvSwingUtils;
import jalview.gui.Preferences;
import jalview.io.FileFormats;
@@
-169,7
+170,7
@@
public class GAlignFrame extends JInternalFrame
protected JCheckBoxMenuItem hiddenMarkers = new JCheckBoxMenuItem();
protected JCheckBoxMenuItem hiddenMarkers = new JCheckBoxMenuItem();
- protected JTabbedPane tabbedPane = jalview.jbgui.swing.JTabbedPane.createTabbedPane();
+ protected JTabbedPane tabbedPane = jalview.jbgui.GDesktop.createTabbedPane();
protected JMenuItem reload = new JMenuItem();
protected JMenuItem reload = new JMenuItem();
@@
-224,7
+225,7
@@
public class GAlignFrame extends JInternalFrame
@Override
public void actionPerformed(ActionEvent e)
{
@Override
public void actionPerformed(ActionEvent e)
{
- outputText_actionPerformed(e);
+ outputText_actionPerformed(e.getActionCommand());
}
});
}
});
@@
-235,7
+236,7
@@
public class GAlignFrame extends JInternalFrame
System.err.println(e.toString());
}
System.err.println(e.toString());
}
- if (!Platform.isAMac())
+ if (Platform.allowMnemonics()) // was "not mac and not JS"
{
closeMenuItem.setMnemonic('C');
outputTextboxMenu.setMnemonic('T');
{
closeMenuItem.setMnemonic('C');
outputTextboxMenu.setMnemonic('T');
@@
-259,7
+260,7
@@
public class GAlignFrame extends JInternalFrame
@Override
public void actionPerformed(ActionEvent e)
{
@Override
public void actionPerformed(ActionEvent e)
{
- saveAs_actionPerformed(e);
+ saveAs_actionPerformed();
}
};
}
};
@@
-284,16
+285,7
@@
public class GAlignFrame extends JInternalFrame
addMenuActionAndAccelerator(keyStroke, closeMenuItem, al);
JMenu editMenu = new JMenu(MessageManager.getString("action.edit"));
addMenuActionAndAccelerator(keyStroke, closeMenuItem, al);
JMenu editMenu = new JMenu(MessageManager.getString("action.edit"));
- JMenu viewMenu = new JMenu(MessageManager.getString("action.view")) {
-
- public void setPopupMenuVisible(boolean b) {
- if (b) {
- openFeatureSettings.setEnabled(haveAlignmentFeatures());
- }
- super.setPopupMenuVisible(b);
- }
-
- };
+ JMenu viewMenu = new JMenu(MessageManager.getString("action.view"));
JMenu annotationsMenu = new JMenu(
MessageManager.getString("action.annotations"));
JMenu showMenu = new JMenu(MessageManager.getString("action.show"));
JMenu annotationsMenu = new JMenu(
MessageManager.getString("action.annotations"));
JMenu showMenu = new JMenu(MessageManager.getString("action.show"));
@@
-1292,7
+1284,6
@@
public class GAlignFrame extends JInternalFrame
openFeatureSettings = new JMenuItem(
MessageManager.getString("action.feature_settings"));
openFeatureSettings = new JMenuItem(
MessageManager.getString("action.feature_settings"));
- openFeatureSettings.setEnabled(false);
openFeatureSettings.addActionListener(new ActionListener()
{
@Override
openFeatureSettings.addActionListener(new ActionListener()
{
@Override
@@
-1301,6
+1292,10
@@
public class GAlignFrame extends JInternalFrame
featureSettings_actionPerformed(e);
}
});
featureSettings_actionPerformed(e);
}
});
+
+ /*
+ * add sub-menu of database we can fetch from
+ */
JMenuItem fetchSequence = new JMenuItem(
MessageManager.getString("label.fetch_sequences"));
fetchSequence.addActionListener(new ActionListener()
JMenuItem fetchSequence = new JMenuItem(
MessageManager.getString("label.fetch_sequences"));
fetchSequence.addActionListener(new ActionListener()
@@
-1308,7
+1303,7
@@
public class GAlignFrame extends JInternalFrame
@Override
public void actionPerformed(ActionEvent e)
{
@Override
public void actionPerformed(ActionEvent e)
{
- fetchSequence_actionPerformed(e);
+ fetchSequence_actionPerformed();
}
});
}
});
@@
-1716,7
+1711,10
@@
public class GAlignFrame extends JInternalFrame
alignFrameMenuBar.add(formatMenu);
alignFrameMenuBar.add(colourMenu);
alignFrameMenuBar.add(calculateMenu);
alignFrameMenuBar.add(formatMenu);
alignFrameMenuBar.add(colourMenu);
alignFrameMenuBar.add(calculateMenu);
- alignFrameMenuBar.add(webService);
+ if (!Jalview.isJS())
+ {
+ alignFrameMenuBar.add(webService);
+ }
fileMenu.add(fetchSequence);
fileMenu.add(addSequenceMenu);
fileMenu.add(fetchSequence);
fileMenu.add(addSequenceMenu);
@@
-1734,10
+1732,7
@@
public class GAlignFrame extends JInternalFrame
fileMenu.add(exportAnnotations);
fileMenu.add(loadTreeMenuItem);
fileMenu.add(associatedData);
fileMenu.add(exportAnnotations);
fileMenu.add(loadTreeMenuItem);
fileMenu.add(associatedData);
- /*
- * No VCF import in Jalview-JS
- * @j2sNative
- */
+ if (!Jalview.isJS())
{
fileMenu.add(loadVcf);
}
{
fileMenu.add(loadVcf);
}
@@
-1835,17
+1830,26
@@
public class GAlignFrame extends JInternalFrame
calculateMenu.addSeparator();
calculateMenu.add(expandAlignment);
calculateMenu.add(extractScores);
calculateMenu.addSeparator();
calculateMenu.add(expandAlignment);
calculateMenu.add(extractScores);
- calculateMenu.addSeparator();
- calculateMenu.add(runGroovy);
+ if (!Jalview.isJS())
+ {
+ calculateMenu.addSeparator();
+ calculateMenu.add(runGroovy);
+ }
webServiceNoServices = new JMenuItem(
MessageManager.getString("label.no_services"));
webService.add(webServiceNoServices);
webServiceNoServices = new JMenuItem(
MessageManager.getString("label.no_services"));
webService.add(webServiceNoServices);
- exportImageMenu.add(htmlMenuItem);
+ if (!Jalview.isJS())
+ {
+ exportImageMenu.add(htmlMenuItem);
+ }
exportImageMenu.add(epsFile);
exportImageMenu.add(createPNG);
exportImageMenu.add(createBioJS);
exportImageMenu.add(epsFile);
exportImageMenu.add(createPNG);
exportImageMenu.add(createBioJS);
- exportImageMenu.add(createSVG);
+ if (!Jalview.isJS())
+ {
+ exportImageMenu.add(createSVG);
+ }
addSequenceMenu.add(addFromFile);
addSequenceMenu.add(addFromText);
addSequenceMenu.add(addFromURL);
addSequenceMenu.add(addFromFile);
addSequenceMenu.add(addFromText);
addSequenceMenu.add(addFromURL);
@@
-1886,12
+1890,6
@@
public class GAlignFrame extends JInternalFrame
// selectMenu.add(listenToViewSelections);
}
// selectMenu.add(listenToViewSelections);
}
- protected boolean haveAlignmentFeatures()
- {
- // because gAlignFrame is not an abstract class -- see AlignFrame
- return false;
- }
-
protected void loadVcf_actionPerformed()
{
}
protected void loadVcf_actionPerformed()
{
}
@@
-2188,7
+2186,7
@@
public class GAlignFrame extends JInternalFrame
{
}
{
}
- protected void outputText_actionPerformed(ActionEvent e)
+ protected void outputText_actionPerformed(String formatName)
{
}
{
}
@@
-2446,7
+2444,7
@@
public class GAlignFrame extends JInternalFrame
{
}
{
}
- protected void saveAs_actionPerformed(ActionEvent e)
+ protected void saveAs_actionPerformed()
{
}
{
}
@@
-2474,7
+2472,7
@@
public class GAlignFrame extends JInternalFrame
}
}
- public void fetchSequence_actionPerformed(ActionEvent e)
+ public void fetchSequence_actionPerformed()
{
}
{
}