WebSVN - OpenConcerto - Diff - Rev 144 and 149 - /trunk/OpenConcerto/src/org/openconcerto/ui/component/ITextCombo.java

         // and they only are modified by the EDT, our executing thread too
         boolean res = true;
         if (!this.completing) {
             this.completing = true;
             // ne completer que si le texte fait plus de 2 char et n'est pas que des chiffres
-            if (originalText.length() > 2 && !DIGIT_PATTERN.matcher(originalText).matches()) {
+            if (canComplete(originalText)) {
                 String completion = this.getCompletion(originalText);
                 if (completion != null && !originalText.trim().equalsIgnoreCase(completion.trim())) {
                     fb.replace(0, fb.getDocument().getLength(), completion, null);
                     // we handled the modification
                     res = false;
+        }
         return res;
+    }
     /**
+     * hook to activate or not complete for a given text
+     *
+     * @return true if completion must occur
+     */
+    public boolean canComplete(final String originalText) {
+        return originalText.length() > 2 && !DIGIT_PATTERN.matcher(originalText).matches();
+    }
+    /**
      * Recherche si on peut completer la string avec les items de completion
+     *
      * @param string the start
      * @return <code>null</code> si pas trouve, sinon le mot complet
      */
             return this.getCurrentValue();
+    }
     public String getCurrentValue() {
         // this.getSelectedItem() renvoie vide quand on tape du texte sans sélection
+        final Object res;
+        if (this.isLocked()) {
+            res = this.getSelectedItem();
+        } else {
-        return (String) (this.isLocked() ? this.getSelectedItem() : this.getEditor().getItem());
+            final ComboBoxEditor editor = this.getEditor();
+            // as documented in the constructor, the editor can sometimes be null
+            res = editor == null ? null : editor.getItem();
+        }
+        return (String) res;
+    }
     public JComponent getComp() {
         return this;
+    }

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/ui/component/ITextCombo.java @ 156 - Rev 144 → 149