From: <ez...@us...> - 2011-11-13 19:42:55
|
Revision: 20339 http://jedit.svn.sourceforge.net/jedit/?rev=20339&view=rev Author: ezust Date: 2011-11-13 19:42:49 +0000 (Sun, 13 Nov 2011) Log Message: ----------- Removed ComboKeyListener. Fixed the Enhanced Dialog KeyHandler to not be so greedy about return keys. Modified Paths: -------------- jEdit/trunk/org/gjt/sp/jedit/AbstractOptionPane.java jEdit/trunk/org/gjt/sp/jedit/gui/EnhancedDialog.java Removed Paths: ------------- jEdit/trunk/org/gjt/sp/util/ComboKeyListener.java Modified: jEdit/trunk/org/gjt/sp/jedit/AbstractOptionPane.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/AbstractOptionPane.java 2011-11-13 19:33:26 UTC (rev 20338) +++ jEdit/trunk/org/gjt/sp/jedit/AbstractOptionPane.java 2011-11-13 19:42:49 UTC (rev 20339) @@ -27,7 +27,6 @@ import javax.swing.*; import java.awt.*; -import org.gjt.sp.util.ComboKeyListener; //}}} /** @@ -105,7 +104,6 @@ { initialized = true; _init(); - // ComboKeyListener.addRecursive(this); } } //}}} Modified: jEdit/trunk/org/gjt/sp/jedit/gui/EnhancedDialog.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/gui/EnhancedDialog.java 2011-11-13 19:33:26 UTC (rev 20338) +++ jEdit/trunk/org/gjt/sp/jedit/gui/EnhancedDialog.java 2011-11-13 19:42:49 UTC (rev 20339) @@ -65,13 +65,13 @@ new ContainerHandler()); getContentPane().addContainerListener(new ContainerHandler()); - //keyHandler = new KeyHandler(); - //addKeyListener(keyHandler); + keyHandler = new KeyHandler(); + addKeyListener(keyHandler); addWindowListener(new WindowHandler()); setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); - enterEnabled = true; + enterEnabled = false; } //}}} Deleted: jEdit/trunk/org/gjt/sp/util/ComboKeyListener.java =================================================================== --- jEdit/trunk/org/gjt/sp/util/ComboKeyListener.java 2011-11-13 19:33:26 UTC (rev 20338) +++ jEdit/trunk/org/gjt/sp/util/ComboKeyListener.java 2011-11-13 19:42:49 UTC (rev 20339) @@ -1,66 +0,0 @@ -package org.gjt.sp.util; - -import java.awt.Component; -import java.awt.Container; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; -import java.util.ArrayList; -import javax.swing.JComboBox; - -//{{{ ComboKeyListener class -/** A class that consumes return and escape keys for JComboBox. - * Useful for Combo Boxes that are in OptionPanes, which need to - * to consume the "return" and "escape" keys, which for some reason, - * the JComboBox does not do by default. - * - * @author ezust - * - **/ - -public class ComboKeyListener implements KeyListener { - - ArrayList<Integer> yummyKeys; - JComboBox m_comboBox; - //[] = { KeyEvent.VK_ESCAPE, KeyEvent.VK_ENTER }; - public ComboKeyListener(JComboBox combobox) { - m_comboBox = combobox; - yummyKeys = new ArrayList<Integer>(); - yummyKeys.add(KeyEvent.VK_ESCAPE); - yummyKeys.add(KeyEvent.VK_ENTER); - } - - @Override - public void keyTyped(KeyEvent e) {} - - @Override - public void keyPressed(KeyEvent e) - { - Integer i = new Integer(e.getKeyCode()); - if (yummyKeys.contains(i)) { - e.consume(); - if (i.equals(KeyEvent.VK_ENTER) && !m_comboBox.isPopupVisible()) - m_comboBox.showPopup(); - else - m_comboBox.hidePopup(); - } - } - - @Override - public void keyReleased(KeyEvent e) { } - - public static void addRecursive(Container c) - { - for (Component child: c.getComponents()) - { - if (child instanceof JComboBox) { - JComboBox combo = (JComboBox) child; - combo.addKeyListener(new ComboKeyListener(combo)); - } - else if (child instanceof Container) - addRecursive((Container)child); - } - } - - - -} //}}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |