[FIX] GUI, Project View

Author: ChristianGruen

basex-core/src/main/java/org/basex/gui/layout/BaseXCombo.java

@@ -138,34 +138,34 @@ public void changedUpdate(final DocumentEvent e) { }
    * @return self reference
    */
   public final BaseXCombo history(final StringsOption key, final Options opts) {
-    if(!isEditable()) throw Util.notExpected("Combobox is not editable.");
-
     options = opts;
     optionKey = key;
     history = new BaseXHistory(key, opts);
     setItems(opts.get(key));
 
-    // store input if enter is pressed; scroll between history entries
+    // editable combo boxes: store input if enter is pressed or focus is lost
     final JTextComponent comp = textField();
-    comp.removeKeyListener(keys);
-    keys = (KeyPressedListener) e -> {
-      final boolean next = NEXTLINE.is(e), prev = PREVLINE.is(e);
-      if((next || prev) && e.isShiftDown()) {
-        final String value = history.get(next);
-        if(value != null) {
-          setText(value);
-          final BaseXDialog dialog = win.dialog();
-          if(dialog != null) dialog.action(this);
+    if(comp != null) {
+      // store input if enter is pressed; scroll between history entries
+      comp.removeKeyListener(keys);
+      keys = (KeyPressedListener) e -> {
+        final boolean next = NEXTLINE.is(e), prev = PREVLINE.is(e);
+        if((next || prev) && e.isShiftDown()) {
+          final String value = history.get(next);
+          if(value != null) {
+            setText(value);
+            final BaseXDialog dialog = win.dialog();
+            if(dialog != null) dialog.action(this);
+          }
         }
-      }
-    };
-    comp.addKeyListener(keys);
-
-    // store input if focus is lost
-    comp.removeFocusListener(focus);
-    focus = (FocusLostListener) e -> updateHistory();
-    comp.addFocusListener(focus);
+      };
+      comp.addKeyListener(keys);
 
+      // store input if focus is lost
+      comp.removeFocusListener(focus);
+      focus = (FocusLostListener) e -> updateHistory();
+      comp.addFocusListener(focus);
+    }
     return this;
   }
 
@@ -212,6 +212,20 @@ public void updateHistory() {
     }
   }
 
+  /**
+   * Adds a value to the history and selects it. In contrast to {@link #setText(String)}, this
+   * ensures that the value can be displayed by a non-editable, history-backed combo box, which
+   * can only show items that are part of its model.
+   * @param value value to add and select
+   */
+  public void select(final String value) {
+    if(history != null) {
+      history.add(value);
+      setItems(history.values());
+    }
+    setText(value);
+  }
+
   /**
    * Returns the current text.
    * @return text

basex-core/src/main/java/org/basex/gui/view/project/ProjectView.java

@@ -75,23 +75,22 @@ public ProjectView(final EditorView view) {
     back.setBorder(new CompoundBorder(new MatteBorder(0, 0, 1, 0, GUIConstants.gray),
         BaseXLayout.border(5, 3, 5, 4)));
 
-    rootPath = new BaseXCombo(gui, true).history(GUIOptions.PROJECTS, gui.gopts);
-    rootPath.setFocusable(false);
-
-    // update project tree if another root is chosen
-    rootPath.textField().getDocument().addDocumentListener(
-      new DocumentListener() {
-        @Override public void insertUpdate(final DocumentEvent e) { changeRoot(); }
-        @Override public void removeUpdate(final DocumentEvent e) { }
-        @Override public void changedUpdate(final DocumentEvent e) { }
+    rootPath = new BaseXCombo(gui, false).history(GUIOptions.PROJECTS, gui.gopts);
+    rootPath.addActionListener(e -> changeRoot());
+    rootPath.addPopupMenuListener(new PopupMenuListener() {
+      @Override public void popupMenuWillBecomeVisible(final PopupMenuEvent e) { }
+      @Override public void popupMenuWillBecomeInvisible(final PopupMenuEvent e) {
+        rootPath.updateHistory();
       }
-    );
+      @Override public void popupMenuCanceled(final PopupMenuEvent e) { }
+    });
 
     final BaseXToolBar buttons = new BaseXToolBar();
 
     final AbstractButton browse = BaseXButton.get("c_edit_open", OPEN, false, gui);
     browse.setToolTipText(CHOOSE_DIR + DOTS);
     browse.addActionListener(e -> chooseRoot());
+    browse.setFocusable(true);
     buttons.add(browse);
 
     back.add(rootPath, BorderLayout.CENTER);
@@ -127,7 +126,7 @@ public void componentResized(final ComponentEvent e) {
       }
     });
 
-    rootPath.setText(dir.path());
+    rootPath.select(dir.path());
   }
 
   /**
@@ -335,13 +334,13 @@ private void chooseRoot() {
     final BaseXFileChooser fc = new BaseXFileChooser(gui, CHOOSE_DIR, root.file.path());
     final IOFile io = fc.select(Mode.DOPEN);
     if(io != null) {
-      rootPath.setText(io.normalize().path());
-      rootPath.updateHistory();
+      rootPath.select(io.normalize().path());
+      changeRoot();
     }
   }
 
   /**
-   * Changes the root directory. Called by document listener of editable root path component.
+   * Changes the root directory. Called when another directory is chosen in the root path combo box.
    */
   private void changeRoot() {
     final IOFile path = new IOFile(rootPath.getText());
@@ -351,7 +350,8 @@ private void changeRoot() {
     gui.saveOptions();
 
     root.file = path;
-    root.refresh();
+    root.expand();
+    tree.expandPath(root.path());
     refresh();
   }
 }