2002/06/23 21:37:02

[org.ibex.core.git] / src / org / xwt / plat / AWT.java

diff --git a/src/org/xwt/plat/AWT.java b/src/org/xwt/plat/AWT.java
index 7f159cf..ab3cfa9 100644 (file)
--- a/src/org/xwt/plat/AWT.java
+++ b/src/org/xwt/plat/AWT.java
@@ -52,10 +52,16 @@ public class AWT extends Platform {
     static class FileDialogHelper extends FileDialog implements WindowListener, ComponentListener {
         Semaphore s;
         public FileDialogHelper(String suggestedFileName, Semaphore s, boolean write) {
-            super(new Frame(), suggestedFileName, write ? FileDialog.SAVE : FileDialog.LOAD);
+            super(new Frame(), write ? "Save" : "Open", write ? FileDialog.SAVE : FileDialog.LOAD);
             this.s = s;
             addWindowListener(this);
             addComponentListener(this);
+            if (suggestedFileName.indexOf(File.separatorChar) == -1) {
+                setFile(suggestedFileName);
+            } else {
+                setDirectory(suggestedFileName.substring(0, suggestedFileName.lastIndexOf(File.separatorChar)));
+                setFile(suggestedFileName.substring(suggestedFileName.lastIndexOf(File.separatorChar) + 1));
+            }
             show();
         }
         public void windowActivated(WindowEvent e) { }
@@ -369,35 +375,10 @@ public class AWT extends Platform {
             case KeyEvent.VK_SHIFT: return "shift";
             case KeyEvent.VK_TAB: return "tab";
             case KeyEvent.VK_UP: return "up";
-
-            // we special-case letters since (C-a).getKeyChar() != 'a'
-            case KeyEvent.VK_A: return "a";
-            case KeyEvent.VK_B: return "b";
-            case KeyEvent.VK_C: return "c";
-            case KeyEvent.VK_D: return "d";
-            case KeyEvent.VK_E: return "e";
-            case KeyEvent.VK_F: return "f";
-            case KeyEvent.VK_G: return "g";
-            case KeyEvent.VK_H: return "h";
-            case KeyEvent.VK_I: return "i";
-            case KeyEvent.VK_J: return "j";
-            case KeyEvent.VK_K: return "k";
-            case KeyEvent.VK_L: return "l";
-            case KeyEvent.VK_M: return "m";
-            case KeyEvent.VK_N: return "n";
-            case KeyEvent.VK_O: return "o";
-            case KeyEvent.VK_P: return "p";
-            case KeyEvent.VK_Q: return "q";
-            case KeyEvent.VK_R: return "r";
-            case KeyEvent.VK_S: return "s";
-            case KeyEvent.VK_T: return "t";
-            case KeyEvent.VK_U: return "u";
-            case KeyEvent.VK_V: return "v";
-            case KeyEvent.VK_W: return "w";
-            case KeyEvent.VK_X: return "x";
-            case KeyEvent.VK_Y: return "y";
-            case KeyEvent.VK_Z: return "z";
-            default: return String.valueOf(k.getKeyChar());
+            default:
+                char c = k.getKeyChar();
+                if (c >= 1 && c <= 26) c = (char)('a' + c - 1);
+                return String.valueOf(c);
             }
         }
     }