Skip to content

Commit

Permalink
Merge pull request #86 from claire-oi/menu_organization
Browse files Browse the repository at this point in the history 
Reorganize and capitalize menu options
  • Loading branch information
@aguynamedryan
aguynamedryan committed Jun 17, 2015
2 parents 2625cb8 + 2f3b091 commit 135eba5
Showing 1 changed file with 21 additions and 21 deletions.
42 changes: 21 additions & 21 deletions src/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
public class RabbitInAHatMain implements ResizeListener, ActionListener {

public final static String ACTION_CMD_SAVE = "Save";
public final static String ACTION_CMD_SAVE_AS = "Save as";
public final static String ACTION_CMD_SAVE_AS = "Save As";
public final static String ACTION_CMD_OPEN_ETL_SPECS = "Open ETL Specs";
public final static String ACTION_CMD_OPEN_SCAN_REPORT = "Open Scan Report";
public final static String ACTION_CMD_GENERATE_ETL_DOCUMENT = "Generate ETL Document";
public final static String ACTION_CMD_DISCARD_COUNTS = "Discard value counts";
public final static String ACTION_CMD_DISCARD_COUNTS = "Discard Value Counts";
public final static String ACTION_CMD_FILTER = "Filter";
public final static String ACTION_CMD_MAKE_MAPPING = "Make Mappings";
public final static String ACTION_CMD_REMOVE_MAPPING = "Remove Mappings";
Expand All @@ -60,9 +60,9 @@ public class RabbitInAHatMain implements ResizeListener, ActionListener {
public final static String ACTION_CMD_MARK_COMPLETED = "Mark Highlighted As Complete";
public final static String ACTION_CMD_UNMARK_COMPLETED = "Mark Highlighted As Incomplete";

private final static FileFilter FILE_FILTER_GZ = new FileNameExtensionFilter("GZIP Files (*.gz)", "gz");
private final static FileFilter FILE_FILTER_GZ = new FileNameExtensionFilter("GZIP Files (*.gz)", "gz");
private final static FileFilter FILE_FILTER_DOCX = new FileNameExtensionFilter("Microsoft Word documents (*.docx)", "docx");
private final static FileFilter FILE_FILTER_CSV = new FileNameExtensionFilter("Text Files (*.csv)", "csv");
private final static FileFilter FILE_FILTER_CSV = new FileNameExtensionFilter("Text Files (*.csv)", "csv");
private JFrame frame;
private JScrollPane scrollPane1;
private JScrollPane scrollPane2;
Expand Down Expand Up @@ -173,29 +173,29 @@ private JMenuBar createMenuBar() {

menuBar.add(fileMenu);

JMenuItem openScanReportItem = new JMenuItem("Open scan report");
JMenuItem openScanReportItem = new JMenuItem(ACTION_CMD_OPEN_SCAN_REPORT);
openScanReportItem.addActionListener(this);
openScanReportItem.setActionCommand(ACTION_CMD_OPEN_SCAN_REPORT);
fileMenu.add(openScanReportItem);

JMenuItem openItem = new JMenuItem("Open ETL specs");
JMenuItem openItem = new JMenuItem(ACTION_CMD_OPEN_ETL_SPECS);
openItem.addActionListener(this);
openItem.setActionCommand(ACTION_CMD_OPEN_ETL_SPECS);
openItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, menuShortcutMask));
fileMenu.add(openItem);

JMenuItem saveItem = new JMenuItem("Save");
JMenuItem saveItem = new JMenuItem(ACTION_CMD_SAVE);
saveItem.addActionListener(this);
saveItem.setActionCommand(ACTION_CMD_SAVE);
saveItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, menuShortcutMask));
fileMenu.add(saveItem);

JMenuItem saveAsItem = new JMenuItem("Save as");
JMenuItem saveAsItem = new JMenuItem(ACTION_CMD_SAVE_AS);
saveAsItem.addActionListener(this);
saveAsItem.setActionCommand(ACTION_CMD_SAVE_AS);
fileMenu.add(saveAsItem);

JMenuItem generateDocItem = new JMenuItem("Generate ETL document");
JMenuItem generateDocItem = new JMenuItem(ACTION_CMD_GENERATE_ETL_DOCUMENT);
generateDocItem.addActionListener(this);
generateDocItem.setActionCommand(ACTION_CMD_GENERATE_ETL_DOCUMENT);
fileMenu.add(generateDocItem);
Expand All @@ -214,18 +214,6 @@ private JMenuBar createMenuBar() {
filter.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F, menuShortcutMask));
editMenu.add(filter);

JMenuItem makeMappings = new JMenuItem(ACTION_CMD_MAKE_MAPPING);
makeMappings.addActionListener(this);
makeMappings.setActionCommand(ACTION_CMD_MAKE_MAPPING);
makeMappings.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_M, menuShortcutMask));
editMenu.add(makeMappings);

JMenuItem removeMappings = new JMenuItem(ACTION_CMD_REMOVE_MAPPING);
removeMappings.addActionListener(this);
removeMappings.setActionCommand(ACTION_CMD_REMOVE_MAPPING);
removeMappings.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_R, menuShortcutMask));
editMenu.add(removeMappings);

JMenu setTarget = new JMenu("Set Target Database");

JMenuItem targetCDMV4 = new JMenuItem(ACTION_CMD_SET_TARGET_V4);
Expand All @@ -246,7 +234,19 @@ private JMenuBar createMenuBar() {

JMenu arrowMenu = new JMenu("Arrows");
menuBar.add(arrowMenu);

JMenuItem makeMappings = new JMenuItem(ACTION_CMD_MAKE_MAPPING);
makeMappings.addActionListener(this);
makeMappings.setActionCommand(ACTION_CMD_MAKE_MAPPING);
makeMappings.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_M, menuShortcutMask));
arrowMenu.add(makeMappings);

JMenuItem removeMappings = new JMenuItem(ACTION_CMD_REMOVE_MAPPING);
removeMappings.addActionListener(this);
removeMappings.setActionCommand(ACTION_CMD_REMOVE_MAPPING);
removeMappings.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_R, menuShortcutMask));
arrowMenu.add(removeMappings);

JMenuItem markCompleted = new JMenuItem(ACTION_CMD_MARK_COMPLETED);
markCompleted.addActionListener(this);
markCompleted.setActionCommand(ACTION_CMD_MARK_COMPLETED);
Expand Down

0 comments on commit 135eba5

Please sign in to comment.