From e5d448bd9a17769029fa174ba0d4bec36745f480 Mon Sep 17 00:00:00 2001 From: claire-oi Date: Tue, 16 Jun 2015 11:34:07 -0700 Subject: [PATCH 1/2] Rearranges menu items; moves make and remove mappings options to Arrows menu --- .../ohdsi/rabbitInAHat/RabbitInAHatMain.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java b/src/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java index 83da7f05..e0a04265 100644 --- a/src/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java +++ b/src/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java @@ -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); @@ -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); From 2f3b0917dc0ed0e0b1fa2079d88b980ed09f8ea2 Mon Sep 17 00:00:00 2001 From: claire-oi Date: Tue, 16 Jun 2015 16:46:09 -0700 Subject: [PATCH 2/2] Changes menu text for consistent capitalization --- .../ohdsi/rabbitInAHat/RabbitInAHatMain.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java b/src/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java index e0a04265..c5f227db 100644 --- a/src/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java +++ b/src/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java @@ -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"; @@ -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; @@ -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);