Author: tchemit Date: 2012-12-18 11:50:00 +0100 (Tue, 18 Dec 2012) New Revision: 86 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/86 Log: change keystroke to esapce popup (Alt+F) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/FrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUI.css Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/FrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/FrequencyCellComponent.java 2012-12-17 09:22:54 UTC (rev 85) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/FrequencyCellComponent.java 2012-12-18 10:50:00 UTC (rev 86) @@ -32,7 +32,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.AbstractAction; import javax.swing.AbstractCellEditor; import javax.swing.JButton; import javax.swing.JTable; @@ -42,7 +41,6 @@ import java.awt.Color; import java.awt.Component; import java.awt.Frame; -import java.awt.event.ActionEvent; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; @@ -146,16 +144,8 @@ // open frequency dialog TuttiUIUtil.openInDialog( - ui, frame, _("tutti.title.frequency"), true, - new AbstractAction() { - private static final long serialVersionUID = 1L; + ui, frame, _("tutti.title.frequency"), true, null); - @Override - public void actionPerformed(ActionEvent e) { - ui.getHandler().close(); - } - }); - // at close, synch back frequencies editRow.updateTotalFromFrequencies(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesFrequencyUI.css 2012-12-17 09:22:54 UTC (rev 85) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesFrequencyUI.css 2012-12-18 10:50:00 UTC (rev 86) @@ -131,6 +131,7 @@ #closeButton { actionIcon: "close"; text: "tutti.action.close"; + mnemonic: F; } #table { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java 2012-12-17 09:22:54 UTC (rev 85) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java 2012-12-18 10:50:00 UTC (rev 86) @@ -39,22 +39,17 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.decorator.Decorator; -import javax.swing.AbstractAction; import javax.swing.AbstractCellEditor; import javax.swing.BorderFactory; import javax.swing.JButton; -import javax.swing.JComponent; import javax.swing.JDialog; -import javax.swing.JRootPane; import javax.swing.JTable; -import javax.swing.KeyStroke; import javax.swing.border.LineBorder; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import java.awt.Color; import java.awt.Component; import java.awt.Frame; -import java.awt.event.ActionEvent; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; @@ -153,16 +148,6 @@ editor.setUndecorated(true); editor.add(ui); editor.setResizable(true); - JRootPane rootPane = editor.getRootPane(); - rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "close"); - rootPane.getActionMap().put("close", new AbstractAction() { - private static final long serialVersionUID = 1L; - - @Override - public void actionPerformed(ActionEvent e) { - ui.getHandler().close(); - } - }); editor.pack(); ComponentResizer cr = new ComponentResizer(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUI.css 2012-12-17 09:22:54 UTC (rev 85) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUI.css 2012-12-18 10:50:00 UTC (rev 86) @@ -43,4 +43,5 @@ #closeButton { actionIcon: "close"; text: "tutti.action.close"; + mnemonic: F; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java 2012-12-17 09:22:54 UTC (rev 85) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java 2012-12-18 10:50:00 UTC (rev 86) @@ -38,22 +38,17 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.AbstractAction; import javax.swing.AbstractCellEditor; import javax.swing.BorderFactory; import javax.swing.JButton; -import javax.swing.JComponent; import javax.swing.JDialog; -import javax.swing.JRootPane; import javax.swing.JTable; -import javax.swing.KeyStroke; import javax.swing.border.LineBorder; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import java.awt.Color; import java.awt.Component; import java.awt.Frame; -import java.awt.event.ActionEvent; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; @@ -156,16 +151,6 @@ editor.add(ui); editor.setSize(DEFAULT_EDITOR_WIDTH, DEFAULT_EDITOR_HEIGHT); editor.setResizable(true); - JRootPane rootPane = editor.getRootPane(); - rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "close"); - rootPane.getActionMap().put("close", new AbstractAction() { - private static final long serialVersionUID = 1L; - - @Override - public void actionPerformed(ActionEvent e) { - ui.getHandler().close(); - } - }); ComponentResizer cr = new ComponentResizer(); cr.registerComponent(editor); ComponentMover cm = new ComponentMover(); @@ -290,7 +275,7 @@ // String text; String textValue; - if (StringUtils.isBlank((String)value)) { + if (StringUtils.isBlank((String) value)) { if (propertyName == null) { AbstractTuttiTableModel tableModel = (AbstractTuttiTableModel) table.getModel(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUI.css 2012-12-17 09:22:54 UTC (rev 85) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUI.css 2012-12-18 10:50:00 UTC (rev 86) @@ -24,4 +24,5 @@ #closeButton { actionIcon: "close"; text: "tutti.action.close"; + mnemonic: F; }